merge of '42e4a37b3bc1bce6b8ffb4ca48e06f8b74e5797a'
authorRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 13:21:25 +0000 (13:21 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 24 Mar 2007 13:21:25 +0000 (13:21 +0000)
     and 'd583b83b9659b4a2ce57f16c9a02e0d6ddcb01c8'


Trivial merge