Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 12 Oct 2009 05:51:36 +0000 (16:51 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 12 Oct 2009 05:51:36 +0000 (16:51 +1100)

Trivial merge