merge of 2615762a802a943fb3b09e52d008cef73cf1c98c
authorRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 19:17:45 +0000 (19:17 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 19 Dec 2006 19:17:45 +0000 (19:17 +0000)
     and 55764cf9a3c5e4a1c7d275cf64d4a459218cd6f1


Trivial merge