Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commitae0fc2c3a580fce8b0ed7ae1b5489a321d99fe35
authorMichael Adam <obnox@samba.org>
Wed, 21 May 2008 08:04:50 +0000 (21 10:04 +0200)
committerMichael Adam <obnox@samba.org>
Wed, 21 May 2008 08:04:50 +0000 (21 10:04 +0200)
tree4ae164dc025a9d402e443930d6efc887802e8c67
parent5cf3083be45bfc68401c0cfc9c8e6f5ac0943d3a
parenta8d27e49003ce43c353c5b3938adb0e11da0a2fa
Merge commit 'origin/v3-2-stable' into v3-2-ctdb