Merge git://git.samba.org/tridge/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 14 May 2008 22:02:51 +0000 (08:02 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 14 May 2008 22:02:51 +0000 (08:02 +1000)

Trivial merge