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

Simple merge