Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 23:47:14 +0000 (00:47 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 23:47:14 +0000 (00:47 +0100)
commitd115497478a4c60bc273d8f63756222eb135aa09
tree2c36c4e2f59f72df95488ad4584622c984dc7ad3
parent9370dbfc49f1836f21e946f589c85a0d27ab49fa
parent53654f5caf701a32b615bed784d78765f351cb73
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 80ce9a3bbc43535d7c4bdd0ec402272175732ebc)