merge of 01463f0f778f17bf5affb08cdcbaac26e6fa830b
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 11:47:17 +0000 (11:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 11:47:17 +0000 (11:47 +0000)
     and 43429e850e314db03c48692ff17d04a96a066125


Trivial merge