merge of 08f9f3c30a1b1ea25e0c7b4202cdd720e48e5114
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 14:33:02 +0000 (14:33 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 14:33:02 +0000 (14:33 +0000)
     and 1dc3cb42dd289da94a94b160b4169efe060a0364


Trivial merge