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

Trivial merge