merge of 3c3ef4d5089ff130a82103510ee9ea45d610c9c6
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 17:30:56 +0000 (17:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 17:30:56 +0000 (17:30 +0000)
     and ba16691706ff35f9217480357f4d2046c526e0d2


Trivial merge