merge of 20b7bbea275e7ecd24b4823a8ce94e3a8df944a9
authorRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 19:46:22 +0000 (19:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 5 Sep 2006 19:46:22 +0000 (19:46 +0000)
     and c2e09eb237e0886af84ee5fd3c3b201c4cec5550


Trivial merge