merge of '994032a8e47f2490d414cd449885b6d0c16271f6'
authorRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 04:12:27 +0000 (04:12 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 04:12:27 +0000 (04:12 +0000)
     and 'b2924f326d269c30e7221e36215ef1bf3a7f16ef'


Trivial merge