merge of '47c01740d6df38376dfcb0407a0b42bb05e60a2b'
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 10:45:16 +0000 (10:45 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Jun 2007 10:45:16 +0000 (10:45 +0000)
     and '8701b75312bc85935a3f37b136efa282813c426f'


Trivial merge