merge of '5f655daae211bb56e41cac62621d6f18543c5bd2'
authorRod Whitby <rod@whitby.id.au>
Tue, 28 Aug 2007 13:33:34 +0000 (13:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 28 Aug 2007 13:33:34 +0000 (13:33 +0000)
     and '6fc40d7a0fd4df5006df760583d8e2e7e87d80b1'


Trivial merge