merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Thu, 22 Nov 2007 22:51:41 +0000 (09:51 +1100)
committerRonnie Sahlberg <sahlberg@ronnie>
Thu, 22 Nov 2007 22:51:41 +0000 (09:51 +1100)

Trivial merge