Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 20 Oct 2009 05:53:04 +0000 (16:53 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 20 Oct 2009 05:53:04 +0000 (16:53 +1100)

Trivial merge