Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Mon, 8 Dec 2008 06:03:50 +0000 (17:03 +1100)
committerMartin Schwenke <martin@meltin.net>
Mon, 8 Dec 2008 06:03:50 +0000 (17:03 +1100)

Trivial merge