merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 24 May 2007 06:06:23 +0000 (16:06 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 24 May 2007 06:06:23 +0000 (16:06 +1000)

Trivial merge