merge of '0805498f21dfb9d3fffd32b8f62fb01162ffc283'
authorRod Whitby <rod@whitby.id.au>
Sat, 1 Sep 2007 07:14:25 +0000 (07:14 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 1 Sep 2007 07:14:25 +0000 (07:14 +0000)
     and '89f3ef8f3c528f0223e26329df896a786c51ffae'


Trivial merge