Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Tue, 26 Feb 2008 12:07:55 +0000 (13:07 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 26 Feb 2008 12:07:55 +0000 (13:07 +0100)
commita999a1fc996234555bd2d8a4a873b39d111c347e
tree737b0bf68f6a93d6e835676b96b8bb3c606d1c91
parent227df641f680d844c85ea0ed1694e41ed355e262
parent901addd4a18a9a166fc3518a7bce70969f884e6f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4dab354b626a02e9a5f5cac0d374d18e22718e18)