merge of 39edb7cb1f59f721cbbef84d4663c268586f700f
authorRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 09:46:27 +0000 (09:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 8 Sep 2006 09:46:27 +0000 (09:46 +0000)
     and 775abaa4c33cb315c1cf7741da44b9517133d401


Trivial merge