merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Tue, 16 Oct 2007 01:26:22 +0000 (11:26 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Tue, 16 Oct 2007 01:26:22 +0000 (11:26 +1000)

Trivial merge