Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 12:22:34 +0000 (22:22 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Jul 2008 12:22:34 +0000 (22:22 +1000)
commit1d3bdf3f546c4ad849333cd743bc97646775c509
tree4d85cb1a497364282668590c4ea1cd9c79448697
parentc46afc8c447e3edb1dc81777700753b98aaa0f93
parentd904b71879cf980f602bfd400cf98396616c13e1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

Conflicts:

source/dsdb/samdb/ldb_modules/simple_ldap_map.c
(This used to be commit 5d539b7da46e38e7570fa5af4549b142f25e4585)
source4/dsdb/samdb/ldb_modules/simple_ldap_map.c