merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Tue, 15 May 2007 00:34:14 +0000 (10:34 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Tue, 15 May 2007 00:34:14 +0000 (10:34 +1000)

Trivial merge