Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision cprovision
authorJelmer Vernooij <jelmer@samba.org>
Sun, 13 Apr 2008 20:49:08 +0000 (22:49 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 13 Apr 2008 20:49:08 +0000 (22:49 +0200)
commit9b8448c1e4567be26fa4890c647e0d4d46efbe20
tree8d40dad23396d4d30564c2899a02b98f14bd83ee
parente2c3fab9d1bf0482c15a115e7d373562ffe50b29
parent75c8dc6c6f3134bb78356630f24617aaeb869344
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision