merge of 375e23fc245ce8133b9f6b1700490e3ff83121e7
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 05:32:08 +0000 (05:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Dec 2006 05:32:08 +0000 (05:32 +0000)
     and a97ce06572d8ea1bafa48ab98a60c896052696b2


Trivial merge