Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 12:51:13 +0000 (14:51 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 12:51:13 +0000 (14:51 +0200)
commit5209a846a9157e649fcdcb561f7eaf19c8c0e465
treeb0a7e52b5646c8eec182dbc391e7934b6804488c
parent625359b2e266105022309df8985720108ecd6f67
parent2ee8d29d22bcb1c350ab59d71b0aee548489bc9c
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c