Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 12 Dec 2008 04:39:53 +0000 (15:39 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 12 Dec 2008 04:39:53 +0000 (15:39 +1100)

Trivial merge