merge of '1af7742e17a7556d323fd4873c9ad1dc74655d34'
authorRod Whitby <rod@whitby.id.au>
Sat, 1 Sep 2007 08:10:02 +0000 (08:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 1 Sep 2007 08:10:02 +0000 (08:10 +0000)
     and '24c7203b69a8d8da8f6cacbf0180f1fc57efa6c1'


Trivial merge