merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sun, 8 Jul 2007 22:38:01 +0000 (08:38 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sun, 8 Jul 2007 22:38:01 +0000 (08:38 +1000)

Trivial merge