merge of '0f0d473a082d7b3643a49221ef58800654470d80'
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Aug 2007 11:04:38 +0000 (11:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 6 Aug 2007 11:04:38 +0000 (11:04 +0000)
     and '8416ad85221db47c91cfb9a3991e6f564dc834f9'


Trivial merge