merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 19 Apr 2007 21:19:07 +0000 (07:19 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 19 Apr 2007 21:19:07 +0000 (07:19 +1000)

Trivial merge