Merge remote-tracking branch 'origin/master' into eventscripts_relative
authorMartin Schwenke <martin@meltin.net>
Mon, 8 Aug 2011 03:25:40 +0000 (13:25 +1000)
committerMartin Schwenke <martin@meltin.net>
Mon, 8 Aug 2011 03:25:40 +0000 (13:25 +1000)
(This used to be ctdb commit b723f23fc9c38e75b91d43306d606be26c55d31d)


Trivial merge