merge of 71838e03ecc147470b6b605de0819927c7cebc0c
authorRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 21:55:01 +0000 (21:55 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 29 Dec 2006 21:55:01 +0000 (21:55 +0000)
     and a15520bc8320348a683cfd241267511a39da4291


Trivial merge