merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Mon, 4 Jun 2007 22:43:30 +0000 (08:43 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Mon, 4 Jun 2007 22:43:30 +0000 (08:43 +1000)

Trivial merge