merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
authorRod Whitby <rod@whitby.id.au>
Wed, 11 Apr 2007 22:15:00 +0000 (22:15 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 11 Apr 2007 22:15:00 +0000 (22:15 +0000)
     and '4d324c4c89d578bda06062c61207aa2b7ff6e41f'


Trivial merge