Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 14:34:45 +0000 (15:34 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 14:34:45 +0000 (15:34 +0100)
commit18c683d7e804e76ac37d4069429b5ba1a9d9ae38
tree3f7e2ade00b93b090c5357cd961284ec7cdcd3ab
parent3157ce9876aa69de54acf3f08e0ee2b16cfaff80
parentce2b7cec10af5bb222715e2e3c0ff139f659ed6e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test