merge of 5dac0e1b5f9f45a441a326fa1473ba5075ccaa72
authorRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 17:39:46 +0000 (17:39 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 1 Jan 2007 17:39:46 +0000 (17:39 +0000)
     and f62e2fac7e13e5139dde0dacbcbda49e2bee246b


Trivial merge