Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Thu, 7 Jan 2010 01:46:26 +0000 (12:46 +1100)
committerMartin Schwenke <martin@meltin.net>
Thu, 7 Jan 2010 01:46:26 +0000 (12:46 +1100)

Trivial merge