merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Fri, 21 Sep 2007 03:20:29 +0000 (13:20 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Fri, 21 Sep 2007 03:20:29 +0000 (13:20 +1000)

Trivial merge