merge of '5dae50ef93c98e8d9c77991af158e433d8152857'
authorRod Whitby <rod@whitby.id.au>
Thu, 15 Mar 2007 10:31:45 +0000 (10:31 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 15 Mar 2007 10:31:45 +0000 (10:31 +0000)
     and 'ce3a8bd725cc6305cd8cd40afb1dce0231d74ebd'


Trivial merge