Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
commit937c5ff336fc02efae038d70020891377b8ba0b1
treea1be46da83b176a59025332f1683cf5ccfe3cfc3
parentce1fe0774b8a0221537d3edae1b6981bf4691126
parentd0656da60a7dac772b5547643bf11a301f69e031
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb

(This used to be ctdb commit 25cfa2aafd653c948430aae8729d293c86a6a68c)