merge of 0bd27d7132e889a225218f2ac437ba4845588f95
authorRod Whitby <rod@whitby.id.au>
Wed, 20 Dec 2006 14:17:32 +0000 (14:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 20 Dec 2006 14:17:32 +0000 (14:17 +0000)
     and 919443611fa953ccf488cdb69b7f7c21b5b2edda


Trivial merge