merge of 03c9a3608b192b2fad1343d4dd75519936d73144
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 08:16:55 +0000 (08:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Dec 2006 08:16:55 +0000 (08:16 +0000)
     and c724020cad347cbe05af20d82909492d379596e0


Trivial merge