merge of 3f1cab3696a164923f4c6eda73f9cc7edcc1fa96
authorRod Whitby <rod@whitby.id.au>
Thu, 7 Sep 2006 23:16:35 +0000 (23:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 7 Sep 2006 23:16:35 +0000 (23:16 +0000)
     and 8e604ecbf7b8dc17cbfdb32aaba484a8c030f7f4


Trivial merge