merge of 7b19bb8bafdf80118e23e0749def26595311edf6
authorRod Whitby <rod@whitby.id.au>
Sun, 5 Nov 2006 11:48:19 +0000 (11:48 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 5 Nov 2006 11:48:19 +0000 (11:48 +0000)
     and dc025c257a42628fdbc3989615d9594e0be78d8a


Trivial merge