merge of 1bd6d2472a343d79342b0a9baf5c136a4044b335
authorRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 11:47:30 +0000 (11:47 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 13 Dec 2006 11:47:30 +0000 (11:47 +0000)
     and 8e3bc2d3a1f5eb2a00d6d0d03073eb2a93abc112


Trivial merge