merge of 105eb7735e9ddc684333ac3d1ab62479d4ca672d
authorRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 03:01:20 +0000 (03:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 3 Sep 2006 03:01:20 +0000 (03:01 +0000)
     and ff7b9f5ef2329b56356a8adcbf70e4c4e9a3ecdb


Trivial merge