merge of '666265b4a513b90901fd852c4b1edc1997feefd1'
authorRod Whitby <rod@whitby.id.au>
Mon, 28 May 2007 22:29:43 +0000 (22:29 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 28 May 2007 22:29:43 +0000 (22:29 +0000)
     and '9a5743f40b7e8b6c87c1e54d50262a06068b8b94'


Trivial merge