merge of 989c601b241187e89e1b85f31d57160876e846cd
authorRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 12:01:02 +0000 (12:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 26 Aug 2006 12:01:02 +0000 (12:01 +0000)
     and b10e32a60893fe8d66257a00d52ef37b7219b121


Trivial merge