merge of 08336880338eaa13f4281f4b644f44ab9fb3014c
authorRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 15:32:19 +0000 (15:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 16 Dec 2006 15:32:19 +0000 (15:32 +0000)
     and aff427acda32c20a5373e172ac0d22545235ec0b


Trivial merge