Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 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)
commit60a6682c855cbe5094433881649e7ed4945a06e7
treed66516ad8b6695335b6ded31bb664b5eaf86d59f
parent148d3b170ae00d4001fa011450c7238052d32ae2
parent6b013c90fda01974ac0c27ac035ce78958276aad
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
(This used to be commit 9b8448c1e4567be26fa4890c647e0d4d46efbe20)