merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 19 Sep 2007 01:54:45 +0000 (11:54 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 19 Sep 2007 01:54:45 +0000 (11:54 +1000)

Trivial merge