Merge remote branch 'martins/tests'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 18 Oct 2011 00:54:55 +0000 (11:54 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 18 Oct 2011 00:54:55 +0000 (11:54 +1100)

Trivial merge