Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commit8e4f23acf95963c302e827452bd20974c7b3c06f
authorMichael Adam <obnox@samba.org>
Thu, 22 May 2008 10:23:43 +0000 (22 12:23 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 22 May 2008 10:23:43 +0000 (22 12:23 +0200)
treec92e23e9326e8cd02a4e769adc6009485b0cf3b7
parent931e96f3713b0488a0f0c1c1cd9f6653a625ba55
parentc1a54982146e347c5b92482ff6a11933e7cde19a
Merge commit 'origin/v3-2-stable' into v3-2-ctdb