merge of 2bce4e429b6826e376c7bb1d60ceaad4e7dd26bf
authorRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 21:07:06 +0000 (21:07 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 27 Dec 2006 21:07:06 +0000 (21:07 +0000)
     and 55c211eeea062bae0ddabf49b85ecec1bb363f48


Trivial merge