merge of 'b25bbba02ddb4b23e57f722647bea8974b902b1e'
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jul 2007 13:28:55 +0000 (13:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 7 Jul 2007 13:28:55 +0000 (13:28 +0000)
     and 'c2b7bf2b98443cd961a60ce5dd26e8d6e01afda2'


Trivial merge