merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Sun, 28 Oct 2007 21:50:51 +0000 (08:50 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Sun, 28 Oct 2007 21:50:51 +0000 (08:50 +1100)

Trivial merge