Merge remote branch 'martins/eventscripts'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 31 Aug 2011 22:52:48 +0000 (08:52 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 31 Aug 2011 22:52:48 +0000 (08:52 +1000)

Trivial merge