merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 9 May 2007 20:55:28 +0000 (06:55 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 9 May 2007 20:55:28 +0000 (06:55 +1000)

Trivial merge