merge of '3aee7c950b6280969c7cf789997c0b58bbd56080'
authorRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 11:44:59 +0000 (11:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 21 Mar 2007 11:44:59 +0000 (11:44 +0000)
     and 'bc89338ca2101af77f442deb20adcbb628e64e65'


Trivial merge