Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
authorJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:57:07 +0000 (22:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 20:57:07 +0000 (22:57 +0200)
commitb1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e
treeb47f72d340b9d0882988099599d13097b7015ef2
parent18f8f5d6561d50b9179541ea24e03a5a807a2a2a
parent9b503470769e1f808c4bdafafba0b93e2ede3bd6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 7fd98e492e2bf71d111ea8fa3ca9108506f60264)