Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 16 Apr 2008 16:17:10 +0000 (18:17 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 16 Apr 2008 16:17:10 +0000 (18:17 +0200)
commitb815b81fb09f770fcacc7e06e82b9ec5f5992fdb
treec1ba8a4082d9da510dab752169f5218494d67a1f
parentc47286e57a80b731a4e7d938572f3b6f0a0a6c57
parentf9ca1a80c6e6a4f3d81b414701fe37b11aa64fae
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit b175e7bf16eb26c0bae9731a9147d1d379ca8888)