Merge remote branch 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 9 Aug 2010 01:35:38 +0000 (11:35 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 9 Aug 2010 01:35:38 +0000 (11:35 +1000)

Trivial merge