Merge branch 'master' into martins
authorMartin Schwenke <martin@meltin.net>
Wed, 19 Nov 2008 02:21:07 +0000 (13:21 +1100)
committerMartin Schwenke <martin@meltin.net>
Wed, 19 Nov 2008 02:21:07 +0000 (13:21 +1100)

Trivial merge