Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 30 Sep 2009 09:22:59 +0000 (19:22 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 30 Sep 2009 09:22:59 +0000 (19:22 +1000)

Trivial merge