merge of 1e97274b2fce0be7f2b05bb936cceea97087b0b3
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 15:17:26 +0000 (15:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 15:17:26 +0000 (15:17 +0000)
     and 33e65cfac9987cd14f1dd1b418226c2e0fb266a2


Trivial merge