Merge commit 'origin/v3-2-test' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Wed, 11 Feb 2009 00:08:24 +0000 (01:08 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 11 Feb 2009 00:08:24 +0000 (01:08 +0100)
commitc98cb1395d11c22db979b793e82ee9c6022bb66f
treecfa1761bb13189ac6edbc9a8d33fa1bdbce0562b
parent4b392baa28a59c6c0b0eaa774b59e204f17fb1fe
parent0331720a321c849141349eb7982ee83298ec47c1
Merge commit 'origin/v3-2-test' into v3-2-ctdb