Merge remote branch 'martins/eventscripts'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 17 Aug 2011 04:10:04 +0000 (14:10 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 17 Aug 2011 04:10:04 +0000 (14:10 +1000)
(This used to be ctdb commit bb008c01989ebb173a3f095ebd2f90ab54f9da91)


Trivial merge