merge of 9c3e6a9f0fc6dee68b82fa2b756b3a4f8b10c1d8
authorRod Whitby <rod@whitby.id.au>
Thu, 24 Aug 2006 18:46:30 +0000 (18:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 24 Aug 2006 18:46:30 +0000 (18:46 +0000)
     and b7a9cc9b6dbc352e0d4650054077abb3b118a5e8


Trivial merge