merge of 07869413caf55a45b7b829f157f9ce531f8538da
authorRod Whitby <rod@whitby.id.au>
Sat, 23 Dec 2006 21:32:19 +0000 (21:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 23 Dec 2006 21:32:19 +0000 (21:32 +0000)
     and 81ad048dfdc6a3a80a0a2fa696910b31ad099b1d


Trivial merge