Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Tue, 2 Jun 2009 06:29:25 +0000 (16:29 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 2 Jun 2009 06:29:25 +0000 (16:29 +1000)

Trivial merge