Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 9 Sep 2009 02:50:21 +0000 (12:50 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 9 Sep 2009 02:50:21 +0000 (12:50 +1000)

Trivial merge