merge of b78c7c4546f01de56c8f4c1618b2175b7c1998f1
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 12:47:44 +0000 (12:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 12:47:44 +0000 (12:47 +0000)
     and fd56d089902ffcb5cc4a139e9d80b24c31c42df6


Trivial merge