Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 29 Sep 2009 02:59:10 +0000 (12:59 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 29 Sep 2009 02:59:10 +0000 (12:59 +1000)

Trivial merge