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)
commit87847afce23fe09536246484dc9ca34db7df2930
tree113d0a7ae81f64a060cc134a313c10150cd9f50f
parent7d5987c2e035d1661f25294c26e3d81ba44def90
parente51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 8238415f3cf2d48601dd3102edfa2c438155f49a)