Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 16 Jun 2009 02:56:55 +0000 (12:56 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 16 Jun 2009 02:56:55 +0000 (12:56 +1000)

Trivial merge