merge of 5fb32ea6c40d2082dd4a97e96049da94197805bd
authorRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 10:01:15 +0000 (10:01 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 29 Aug 2006 10:01:15 +0000 (10:01 +0000)
     and 9aa86687e7b05c58ae96324abb450a588180f55e


Trivial merge