Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 6 Oct 2009 02:39:31 +0000 (13:39 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 6 Oct 2009 02:39:31 +0000 (13:39 +1100)

Trivial merge