merge of '05c8f69b2d2ba03b628ce8728fe2137af29844b1'
authorRod Whitby <rod@whitby.id.au>
Wed, 30 May 2007 10:18:45 +0000 (10:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 30 May 2007 10:18:45 +0000 (10:18 +0000)
     and '6138ca9835c33fa432008f157293e2b0c2b6d7c7'


Trivial merge