merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 14 Sep 2007 02:18:34 +0000 (12:18 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 14 Sep 2007 02:18:34 +0000 (12:18 +1000)

Trivial merge