merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sat, 9 Jun 2007 11:52:24 +0000 (21:52 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Sat, 9 Jun 2007 11:52:24 +0000 (21:52 +1000)

Trivial merge