Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Sep 2009 04:23:37 +0000 (14:23 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Sep 2009 04:23:37 +0000 (14:23 +1000)

Trivial merge