merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
authorRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 00:55:36 +0000 (00:55 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 12 Apr 2007 00:55:36 +0000 (00:55 +0000)
     and '4758fedca3a1292214bf6a18707cf62a76cf3c6c'


Trivial merge