merge of '9e630059a4b5a01df2ca930af52243eb89cb3934'
authorRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 06:41:36 +0000 (06:41 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 06:41:36 +0000 (06:41 +0000)
     and 'b8a61703b8f66e806f4a8f08ec9b1a15ab8975c6'


Trivial merge