merge of '0bc3c3218eac32db6b13fb154e1fc29a0b348663'
authorRod Whitby <rod@whitby.id.au>
Mon, 3 Sep 2007 09:52:44 +0000 (09:52 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 3 Sep 2007 09:52:44 +0000 (09:52 +0000)
     and 'c1014f980e6dad4562c28412cfb1935df7ce9057'


Trivial merge