merge of 8c0ee839c15de000465e4d409b592f8b6e543fb7
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 11:17:29 +0000 (11:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 11:17:29 +0000 (11:17 +0000)
     and c1aab6feffff3926bb5316a4a88dac41176ac4e5


Trivial merge