Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 11 Nov 2009 01:16:30 +0000 (12:16 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 11 Nov 2009 01:16:30 +0000 (12:16 +1100)

Trivial merge