merge of '15bd9ab3bb169e676b199f732c73e4daa38511ce'
authorRod Whitby <rod@whitby.id.au>
Thu, 6 Sep 2007 07:04:32 +0000 (07:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 6 Sep 2007 07:04:32 +0000 (07:04 +0000)
     and '23eca17a29c5cd3c74a163af0f580f4e2b481162'


Trivial merge