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


Trivial merge