Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Jul 2008 03:42:39 +0000 (13:42 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Jul 2008 03:42:39 +0000 (13:42 +1000)

Trivial merge