merge of '3010c8d9b229ee097f809082df8fa23835ce261f'
authorRod Whitby <rod@whitby.id.au>
Mon, 14 May 2007 11:05:55 +0000 (11:05 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 14 May 2007 11:05:55 +0000 (11:05 +0000)
     and 'e173605c3b1c2fe06e8a3d500f54d0d06a15896b'


Trivial merge