Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into HEAD
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 09:10:56 +0000 (11:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 09:10:56 +0000 (11:10 +0200)
commita039acb9156b3855e8565ce6d1ca078aea18a349
tree98ee45aee9df12006327e282c9fca5aa627aa703
parent4dd29284bdffc96df1d6eb71b25e305f107d1e12
parent695cee0349f561625e4bbfa3a142a5e35f7eb4bf
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into HEAD