merge of '531b56411734b2c857cc1bcb737fcccef9833ab1'
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 10:54:20 +0000 (10:54 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 6 Feb 2007 10:54:20 +0000 (10:54 +0000)
     and '5c2c70f1ecf63e84f8c487423e9c7d65a4f05d8e'


Trivial merge