Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 20:08:49 +0000 (22:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 20:08:49 +0000 (22:08 +0200)
commit038987543043346cdcd8a4b8fe2970cd1350a7a7
tree63df88d6cc354bd766a4b9b3f36d3e43bf67872b
parentf01c377bc039b776ded213f455cdb79d682ae7b2
parentb708a3d1e7f8d98bc6cedad8d405b1434d32a22e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
(This used to be commit 70ebb22c3df178a26c26c0a25c5722ff9ccdb0b4)