merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 2 Jun 2007 22:32:29 +0000 (08:32 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 2 Jun 2007 22:32:29 +0000 (08:32 +1000)

Trivial merge