merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Tue, 15 Jan 2008 23:18:26 +0000 (10:18 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Tue, 15 Jan 2008 23:18:26 +0000 (10:18 +1100)

Trivial merge