updates from tridge
authorjmcd@samba.org <>
Mon, 28 May 2007 12:45:19 +0000 (08:45 -0400)
committerjmcd@samba.org <>
Mon, 28 May 2007 12:45:19 +0000 (08:45 -0400)
(This used to be ctdb commit ea7c2faaa7630fbb04a635fffcd42f0338c46846)


Trivial merge