merge of 613b5c88485972422f9f5ca5450f8d356f4a22cd
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 19:17:06 +0000 (19:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 19:17:06 +0000 (19:17 +0000)
     and 6b5174a92b34a002e2e75bb09cc02e1d8770811f


Trivial merge