Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 21 Oct 2008 19:20:00 +0000 (12:20 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 21 Oct 2008 19:20:00 +0000 (12:20 -0700)
1  2 
source/rpc_server/srv_samr_nt.c

Simple merge