merge of 2b68c3f3daefc2e1d866e4d3a818bdb2c9530909
authorRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 22:32:23 +0000 (22:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 22:32:23 +0000 (22:32 +0000)
     and 7dc5c6145f5a9f64aba3521e24e1a0b1ff7f0e0e


Trivial merge