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 13:11:45 +0000 (14:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 13:11:45 +0000 (14:11 +0100)
commit76d6c43ef28ef06d8b2e603da0fa8e5c6faf5fdd
tree69042d3212d9046f65fe3123fb0f1b6b46dbfd8b
parent517bf7aa4f77ac0ef421f960f5610b185f6e598e
parentc3ce0a0b95b6051a356c72424c2d62b77a0e81df
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 84b677285250d9b9a1120fcfd6e4bbbb8f939fe8)