Merge commit 'origin/v3-2-stable' into v3-2-ctdbbuild_3.2.0_ctdb.35
commitd6dcbe724b7d5518af27468aa717f98b9e7eb02b
authorMichael Adam <obnox@samba.org>
Fri, 4 Jul 2008 10:19:22 +0000 (4 12:19 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 4 Jul 2008 10:19:22 +0000 (4 12:19 +0200)
tree3f67d2ea3c2820103961fc9f3013ff3aaf2f1007
parentb5a0ed9743481e0ca9c642d5284a02d56eacabd7
parenta5d2b6a0228634dda3e495e0cf86db551b11e4d7
Merge commit 'origin/v3-2-stable' into v3-2-ctdb