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 21:30:17 +0000 (23:30 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 21:30:17 +0000 (23:30 +0200)
commit0239011ced6c864f85b47a342438228a8f6940ee
treef0f062f13292c9ed15586cbfc0d369aa6a6decd3
parent7fd98e492e2bf71d111ea8fa3ca9108506f60264
parent799095b4e567f4495adf7d1d7bcb81dda6782959
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4