merge of 3313872abc2bfcbfb21ee59fce1b8d5dcc921f9e
authorRod Whitby <rod@whitby.id.au>
Fri, 22 Sep 2006 17:10:06 +0000 (17:10 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 22 Sep 2006 17:10:06 +0000 (17:10 +0000)
     and bc4c059f4f2e150e3e6a17f3e80ee88cbd36e52e


Trivial merge