merge of 556701784db3bdee81ffbb2c896a747e4e4e19b0
authorRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 14:48:59 +0000 (14:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 18 Dec 2006 14:48:59 +0000 (14:48 +0000)
     and 8b3f99cac7b433e63ebc902c06ae99fbf39205c7


Trivial merge