merge of '2a7482626b33acc99e7f2e051248f4b8c14ba8b6'
authorRod Whitby <rod@whitby.id.au>
Sun, 21 Sep 2008 08:44:53 +0000 (08:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 21 Sep 2008 08:44:53 +0000 (08:44 +0000)
     and '376b2801a236cb7fb928cf8f4799e6a4f94fc93f'


Trivial merge