r24013: merge from http://samba.org/~tridge/samba_3_2_ctdb/: