merge of 7d5c4e9e02ee9f5067a674b75bf7163b0b89b564
authorRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 16:17:56 +0000 (16:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 14 Dec 2006 16:17:56 +0000 (16:17 +0000)
     and ac97b5dda94e3dd3810be1fdc086163b1dff36ae


Trivial merge