merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 10 Jan 2008 04:20:16 +0000 (15:20 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 10 Jan 2008 04:20:16 +0000 (15:20 +1100)

Trivial merge