merge of a9a95bb24e3111d9f2b31e8ea11f62e39bd734a3
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 16:32:35 +0000 (16:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 11 Dec 2006 16:32:35 +0000 (16:32 +0000)
     and f676cd284b9a8b9f5aa245c3324c11851836beb8


Trivial merge