Merge commit 'master/master'
commit23ec448f83ab00105b214388df287f0a934cdb7a
authorAndrew Tridgell <tridge@samba.org>
Fri, 3 Oct 2008 19:23:00 +0000 (3 12:23 -0700)
committerAndrew Tridgell <tridge@samba.org>
Fri, 3 Oct 2008 19:23:00 +0000 (3 12:23 -0700)
treede94cbd50e47eb7592e5bdf9e42643fb5aa4f239
parent163fa1d25ae2104b634ba37ed97d51fe033cbc1f
parentc7625979ceb350d90d87d2add6ed7156440072c3
Merge commit 'master/master'
source4/cldap_server/netlogon.c
source4/dsdb/samdb/ldb_modules/partition.c