merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sun, 16 Sep 2007 21:43:15 +0000 (07:43 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sun, 16 Sep 2007 21:43:15 +0000 (07:43 +1000)

Trivial merge