Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 18:41:52 +0000 (19:41 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 18:41:52 +0000 (19:41 +0100)
commit54ebd4e353038e86470ad036aa038e18a4296b4b
tree769f4eb442442dc48555a08eb72204d9a3e8b2e6
parentda1a9438bd89569077ef1eaa9dc977b5f9d62836
parent83387ecccfe95b80525bf53c5fc9e945ffee10ec
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial