Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Thu, 22 Oct 2009 06:48:09 +0000 (17:48 +1100)
committerMartin Schwenke <martin@meltin.net>
Thu, 22 Oct 2009 06:48:09 +0000 (17:48 +1100)

Trivial merge