Merge commit 'origin/master' into for-ronnie
authorMartin Schwenke <martin@meltin.net>
Fri, 12 Sep 2008 08:21:51 +0000 (18:21 +1000)
committerMartin Schwenke <martin@meltin.net>
Fri, 12 Sep 2008 08:21:51 +0000 (18:21 +1000)

Trivial merge