merge of 03286e05287c9be2dc05021f2b6006efd7d30f3a
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 14:18:17 +0000 (14:18 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 14:18:17 +0000 (14:18 +0000)
     and a6590ff2f21ebb43ab29209d0580dc897c1c1993


Trivial merge