merge of 842867b86f48a8f46c04c857d103bd60d98d1062
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 16:46:34 +0000 (16:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 Aug 2006 16:46:34 +0000 (16:46 +0000)
     and 9d224d3045ff80efaf3a2c11a9b1439564dfb3d0


Trivial merge