Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 12:45:17 +0000 (13:45 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 12:45:17 +0000 (13:45 +0100)
commit8238415f3cf2d48601dd3102edfa2c438155f49a
treed34bd239ceb88098a4d6df77ffda48c787a0cd64
parent138aaef0781e0754cc17b3ffdaa6062ba70c0c6a
parent837eb8a0bc011cd84bc7e8d2849028313d709928
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial