Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 21 Oct 2009 10:48:15 +0000 (21:48 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 21 Oct 2009 10:48:15 +0000 (21:48 +1100)

Trivial merge