merge of '12edb579fffee6ffcbbed6a66d80c97b7705d000'
authorRod Whitby <rod@whitby.id.au>
Thu, 30 Nov 2006 21:44:30 +0000 (21:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 30 Nov 2006 21:44:30 +0000 (21:44 +0000)
     and '48ac4b4de7e34d9fabc14d0f69415e4c1168e98b'


Trivial merge