Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 14 Feb 2008 11:03:11 +0000 (12:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 14 Feb 2008 11:03:11 +0000 (12:03 +0100)
commit50697762fd28e2fc77142c5fea528b12d4cc0ebc
tree8ea9fb2a31de838b14955a36080469f551b96c30
parent8d41cb23dea4fccfc2b3fc8a816cda54af6038fb
parent3aaa2e86d94675c6c68d66d75292c3e34bfbc81b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial