Merge commit 'origin/master'
authorMartin Schwenke <martin@meltin.net>
Fri, 22 Jan 2010 06:05:11 +0000 (17:05 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 22 Jan 2010 06:05:11 +0000 (17:05 +1100)

Trivial merge