Merge git://git.samba.org/tridge/ctdb 1.0.54 obnox/1.0.54 origin/1.0.54 ctdb-1.0.54
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Aug 2008 03:11:07 +0000 (13:11 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 8 Aug 2008 03:11:07 +0000 (13:11 +1000)

Trivial merge