Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Wed, 29 Jul 2009 00:08:56 +0000 (10:08 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 29 Jul 2009 00:08:56 +0000 (10:08 +1000)

Trivial merge