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 00:03:52 +0000 (01:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 00:03:52 +0000 (01:03 +0100)
commit4bce5c669630b834548612aaed18fe31ecbc1064
tree986e66d96f85d07fcdf724c9d9a3fedf233c5ec4
parent2b408e9ed4caf14e1ac047fd76127a5c979e5177
parent61953e24a5789f08e82fb697f45535f4a87883b1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test