Merge remote branch 'martins/warnings'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:36:45 +0000 (14:36 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:36:45 +0000 (14:36 +1100)

Trivial merge