merge of 'bac543c4612d852bbed6209100ed1a521881f0cf'
authorRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 10:04:32 +0000 (10:04 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 10:04:32 +0000 (10:04 +0000)
     and 'e4d75b274d0d0e865c3387c7fffdc927c195383a'


Trivial merge