merge of '0bb5f3998d4f44cc03385e6faf36b48a3e409038'
authorRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 12:06:39 +0000 (12:06 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 29 Nov 2006 12:06:39 +0000 (12:06 +0000)
     and 'bf81f1dd32251679f83fb6d65f199538128566aa'


Trivial merge