Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 17 Jul 2009 02:45:08 +0000 (12:45 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 17 Jul 2009 02:45:08 +0000 (12:45 +1000)

Trivial merge