merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 10 May 2007 07:59:51 +0000 (17:59 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 10 May 2007 07:59:51 +0000 (17:59 +1000)

Trivial merge