Merge remote branch 'martins/tests'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 31 Aug 2011 22:55:23 +0000 (08:55 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 31 Aug 2011 22:55:23 +0000 (08:55 +1000)

Trivial merge