merge of '02e9149a64fb51811fbc732f21698b412dadb41b'
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Jun 2007 09:21:58 +0000 (09:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Jun 2007 09:21:58 +0000 (09:21 +0000)
     and 'd6d4199be1379dc951fdff8d42e70b1f30a839de'


Trivial merge