merge of 1ce847551d29aa89a9004dbe9df99547f6f93e3f
authorRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 13:30:54 +0000 (13:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 18 Aug 2006 13:30:54 +0000 (13:30 +0000)
     and 24bcf5837228b66a9599b02fe299f374ba9db2fb


Trivial merge