Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 5 Aug 2008 23:17:41 +0000 (09:17 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 5 Aug 2008 23:17:41 +0000 (09:17 +1000)
(This used to be ctdb commit 14f2f719e6ddc266aafde4d4bf80ed3a01e145fe)


Trivial merge