Merge commit 'origin/status-test' into status-test
authorMartin Schwenke <martin@meltin.net>
Tue, 24 Nov 2009 05:14:54 +0000 (16:14 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 24 Nov 2009 05:14:54 +0000 (16:14 +1100)

Trivial merge