Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 13 Nov 2009 01:25:31 +0000 (12:25 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 13 Nov 2009 01:25:31 +0000 (12:25 +1100)

Trivial merge