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)
commit91baa45dfd3cc56e3b97876d1ec4d6a4b48fbaab
tree08bf467f32dd6ad38b2d4323910f5a88c68ffa42
parentb1bdcd4a8a11f28b2750a26b46983cc6b1c1bf5e
parent1b5f32128d1867829647a4e1f20b6e8363444f66
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 0239011ced6c864f85b47a342438228a8f6940ee)