Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 8 May 2008 07:49:48 +0000 (17:49 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 8 May 2008 07:49:48 +0000 (17:49 +1000)

Trivial merge