Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 11 Aug 2009 22:48:03 +0000 (08:48 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 11 Aug 2009 22:48:03 +0000 (08:48 +1000)

Trivial merge