Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Tue, 9 Dec 2008 00:46:34 +0000 (11:46 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 9 Dec 2008 00:46:34 +0000 (11:46 +1100)

Trivial merge