merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Wed, 17 Oct 2007 00:10:52 +0000 (10:10 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Wed, 17 Oct 2007 00:10:52 +0000 (10:10 +1000)

Trivial merge