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 17:05:09 +0000 (18:05 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 19 Feb 2008 17:05:09 +0000 (18:05 +0100)
commitab915504aaa40cebe5fa09a47b2ae46f7f9f334a
tree5faa5e1d38fd6359e5f832bbe60e878fe9284e12
parent95b294f75b05b31cace3818b85b5bf1b8d4722f2
parent5233e43ec7e96afb905f026309b0894178c96499
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 02cb396d42976efc03fcb0082e914eb17ae72e11)