merge of '1b7c658e3119f96127604c0bc4502889f9e1cd40'
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Mar 2007 10:13:08 +0000 (10:13 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 7 Mar 2007 10:13:08 +0000 (10:13 +0000)
     and '39b23b4beb7895e8780a01657dbf05431b5a4918'


Trivial merge