merge of '152f9383d2f39ad2be81ef7b6cef6e3cd553f1fe'
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Feb 2007 15:33:45 +0000 (15:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 7 Feb 2007 15:33:45 +0000 (15:33 +0000)
     and '695d9d0da30616c2995fd855c846ff8a66a86363'


Trivial merge