Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Aug 2008 00:59:40 +0000 (10:59 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Aug 2008 00:59:40 +0000 (10:59 +1000)

Trivial merge