Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorSimo Sorce <idra@samba.org>
Fri, 1 Feb 2008 19:24:31 +0000 (14:24 -0500)
committerSimo Sorce <idra@samba.org>
Fri, 1 Feb 2008 19:24:31 +0000 (14:24 -0500)
commit7dbfc7bdc65314466a83e8121b35c9bcb24b2631
treeae46f34b9b2ab8dc48eddfc2d4c3f163ca78a89c
parent9347d34b502bef70cdae8f3e8acd9796dba49581
parent69e8a83093149201c36ffc2b7fadfa469aabf7bd
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
source/winbindd/winbindd_dual.c
source/winbindd/winbindd_util.c