Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 11 Feb 2010 03:08:41 +0000 (14:08 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 11 Feb 2010 03:08:41 +0000 (14:08 +1100)

Trivial merge