Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Thu, 4 Dec 2008 03:42:04 +0000 (14:42 +1100)
committerMartin Schwenke <martin@meltin.net>
Thu, 4 Dec 2008 03:42:04 +0000 (14:42 +1100)

Trivial merge