Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Mon, 17 Aug 2009 03:08:42 +0000 (13:08 +1000)
committerMartin Schwenke <martin@meltin.net>
Mon, 17 Aug 2009 03:08:42 +0000 (13:08 +1000)

Trivial merge