Merge remote branch 'martins/eventscript.62.cnfs'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 10 Aug 2011 05:31:56 +0000 (15:31 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 10 Aug 2011 05:31:56 +0000 (15:31 +1000)

Trivial merge