merge of 0a9ecefe53a365e158ea60774a322f0f6c3557b4
authorRod Whitby <rod@whitby.id.au>
Thu, 7 Sep 2006 16:32:05 +0000 (16:32 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 7 Sep 2006 16:32:05 +0000 (16:32 +0000)
     and 2febf377486cc323b811be579e1fd1a7d891cee6


Trivial merge