merge of 0586723c132fcaccdd651a3c5d8c002f047ae9ed
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 12:17:31 +0000 (12:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 12:17:31 +0000 (12:17 +0000)
     and f5f0e13e97c221bdaa5281f17bf2ce322fc3ea4b


Trivial merge