merge of '480683c7159495a79be8eb396d93cb882bc195cf'
authorRod Whitby <rod@whitby.id.au>
Sat, 26 May 2007 07:57:41 +0000 (07:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 May 2007 07:57:41 +0000 (07:57 +0000)
     and 'db1728ec4eb0f06b07e6e7376cff9b934b0b6de1'


Trivial merge