merge of '76f17964c43f7ddee34e65c3b91d78a68aecd213'
authorRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 21:28:01 +0000 (21:28 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 21:28:01 +0000 (21:28 +0000)
     and '965f72e4cde00c3f4d4826ce609b171e77b92e00'


Trivial merge