merge of 173720b79189de0792917607079901afb06ac4c9
authorRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 23:16:30 +0000 (23:16 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 23:16:30 +0000 (23:16 +0000)
     and 79739dff83f642e3496fd0b3a72e803e4ce27fbf


Trivial merge