merge of '158dc61862c10660d5b940391b1c809a551cf97c'
authorRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 22:57:31 +0000 (22:57 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 6 Apr 2007 22:57:31 +0000 (22:57 +0000)
     and 'c6346a6de5d825ca4ddd2b7129cbcaeaf371c86a'


Trivial merge