Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 22 Oct 2009 23:43:13 +0000 (10:43 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 22 Oct 2009 23:43:13 +0000 (10:43 +1100)

Trivial merge