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

Trivial merge