Merge remote branch 'martins/takeover'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:30:49 +0000 (16:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:30:49 +0000 (16:30 +1100)

Trivial merge