merge of 'ae579c1f35512dfab367e798299148581e0c7b11'
authorRod Whitby <rod@whitby.id.au>
Wed, 15 Nov 2006 07:20:03 +0000 (07:20 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 15 Nov 2006 07:20:03 +0000 (07:20 +0000)
     and 'bcb6ebdf4f4051fe2953e3f6319bdf6ef5e111a9'


Trivial merge