merge of 1e94290a7ac169e4fd602f3ed164e96332ec1c9f
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 14:47:32 +0000 (14:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 14:47:32 +0000 (14:47 +0000)
     and ab3a01a7cf345a0c6ee0f26d5c46b43fd46da4b1


Trivial merge