Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 21 Nov 2008 02:00:37 +0000 (13:00 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 21 Nov 2008 02:00:37 +0000 (13:00 +1100)

Trivial merge