Merge remote branch 'martins/eventscript_tests'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 15 Aug 2011 05:15:12 +0000 (15:15 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 15 Aug 2011 05:15:12 +0000 (15:15 +1000)

Trivial merge