merge of 3961d9fa0932ee3f91d25b24350816ff1c3c7ff8
authorRod Whitby <rod@whitby.id.au>
Thu, 28 Dec 2006 20:32:36 +0000 (20:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 28 Dec 2006 20:32:36 +0000 (20:32 +0000)
     and e35ed7062f70dd7ea289c17ad5630aca8ab10e60


Trivial merge