merge of '15eabf62626d7b5980c5f03a6eb67c7cf0c49ccb'
authorRod Whitby <rod@whitby.id.au>
Mon, 19 Mar 2007 03:38:52 +0000 (03:38 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 19 Mar 2007 03:38:52 +0000 (03:38 +0000)
     and 'ebcce1007fcce84849ea57fa3d8bfc60cf7001a9'


Trivial merge