merge of 04fc443fb07deb514c4218a844a23809017c4005
authorRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 10:19:35 +0000 (10:19 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 21 Dec 2006 10:19:35 +0000 (10:19 +0000)
     and 76e7f9f8a56e5ea977d7491ec4871f97befb0507


Trivial merge