merge of '6e9b78a5c703daeb1a1bbbe92e36290093562200'
authorRod Whitby <rod@whitby.id.au>
Mon, 10 Sep 2007 13:59:35 +0000 (13:59 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 10 Sep 2007 13:59:35 +0000 (13:59 +0000)
     and '92292c95570e7e9726cb59c43fba57b359eba5c2'


Trivial merge