merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 10 Oct 2007 00:49:55 +0000 (10:49 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 10 Oct 2007 00:49:55 +0000 (10:49 +1000)

Trivial merge