Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
commit2fffc9a1b1fe2a1490e867bb38462e50c282d2b3
authorSimo Sorce <idra@samba.org>
Fri, 1 Feb 2008 19:24:31 +0000 (1 14:24 -0500)
committerSimo Sorce <idra@samba.org>
Fri, 1 Feb 2008 19:24:31 +0000 (1 14:24 -0500)
tree428e09c9b35138db8b7ca7161c659a71aa129d29
parent93a3c5b3f9927973b4ad1496f593ea147052d1e1
parentb708005a7106db26d7df689b887b419c9f2ea41c
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 7dbfc7bdc65314466a83e8121b35c9bcb24b2631)
source3/winbindd/winbindd_dual.c
source3/winbindd/winbindd_util.c