Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Fri, 31 Jul 2009 01:04:37 +0000 (11:04 +1000)
committerMartin Schwenke <martin@meltin.net>
Fri, 31 Jul 2009 01:04:37 +0000 (11:04 +1000)

Trivial merge