Merge commit 'origin/v3-2-stable' into v3-2-ctdb
commit977c4dc645f454c4975c125f58f34fcf57455b51
authorMichael Adam <obnox@samba.org>
Fri, 23 May 2008 23:24:47 +0000 (24 01:24 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 23 May 2008 23:24:47 +0000 (24 01:24 +0200)
tree53e4b57b77232d6b1c21a036d82a03630b19e789
parentcab21f01f760de87979aa6bdbd3e1d8498ae0954
parent874bc18a992999af5413d3c17d674108a3078f67
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
source/lib/util.c
source/winbindd/winbindd_cm.c