merge of 33fd418004d32041014bd8fe712eaeb412a503cf
authorRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 14:16:15 +0000 (14:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 2 Sep 2006 14:16:15 +0000 (14:16 +0000)
     and 6401c65a46b33356819b171a03e513d4de5c0225


Trivial merge