Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Wed, 10 Dec 2008 00:42:02 +0000 (11:42 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 10 Dec 2008 00:42:02 +0000 (11:42 +1100)

Trivial merge