merge of '21944f0f10c4b5fc5cbb2468a81955b02d5ad97e'
authorRod Whitby <rod@whitby.id.au>
Sat, 22 Sep 2007 22:43:49 +0000 (22:43 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 22 Sep 2007 22:43:49 +0000 (22:43 +0000)
     and '627a0e4a4d8f7eebf74939e0642c5fb01872af01'


Trivial merge