merge of da3cdfb77d78c30d35dd871b78d9365f8bc3a22d
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 19:17:41 +0000 (19:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 19:17:41 +0000 (19:17 +0000)
     and e5da7724264150ba0849912120ae0a91de1e10d1


Trivial merge