Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into fixbuild
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:34:22 +0000 (22:34 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:34:22 +0000 (22:34 +0200)
commit7be47a366531e8abde03429f433593657becb750
tree6d7bd6cf2690f776ffddfdcec71c08639a888906
parent2bc26db97fea4562415956269d05ea65e5710045
parent68a2c547d00d7a8d0c15744172489d9d010c31a3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into fixbuild
(This used to be commit d2d564ad2e9b7cb0440a30a302176cce333649c7)