Merge remote branch 'martins/eventscripts'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 04:01:13 +0000 (15:01 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 04:01:13 +0000 (15:01 +1100)

Trivial merge