Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Thu, 7 Aug 2008 06:01:20 +0000 (16:01 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 7 Aug 2008 06:01:20 +0000 (16:01 +1000)

Trivial merge