Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorMichael Adam <obnox@samba.org>
Mon, 21 Jul 2008 10:40:49 +0000 (12:40 +0200)
committerMichael Adam <obnox@samba.org>
Mon, 21 Jul 2008 10:40:49 +0000 (12:40 +0200)
commitf7f8019b9c84adf8cf6f50c1386d8dc455b40ece
tree6d1518f1075095c3302db241732a33397e78a59b
parentf9c9d50ea65b736ee185edad7b5e6bd724f3f938
parentd1034756a1456db4aa29e07ba444be5f39ad8c90
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
source/winbindd/winbindd.c