Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 24 Jan 2008 21:00:07 +0000 (22:00 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 24 Jan 2008 21:00:07 +0000 (22:00 +0100)
commitd4d4120b715dc37b708b1c6074eab4f5c23d6b8f
tree3108464067f2d622413747f6b76198accaee785b
parent1de69a772e1cc007220add1f51bffe83784c3344
parentdd77fc45eee2dde7bdd31a2e39387e94cec158aa
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial