merge of '70c084287ee0a79ec1b6f836a397f815f88a8a6d'
authorRod Whitby <rod@whitby.id.au>
Fri, 9 Feb 2007 02:44:22 +0000 (02:44 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 9 Feb 2007 02:44:22 +0000 (02:44 +0000)
     and 'bad4f5a5ecf1f7fd7505af71bd3f4481900ba0fa'


Trivial merge