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)
commit80ce9a3bbc43535d7c4bdd0ec402272175732ebc
tree3fbfce684e8759cf2be53383b6583a6acb235bdc
parent40dffc177babec01c63fb717506fa86ff70a5b28
parentee170c85e0e76411bd752de5fe51db6940dab929
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test