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 18:00:32 +0000 (20:00 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 18:00:32 +0000 (20:00 +0200)
commit18f8f5d6561d50b9179541ea24e03a5a807a2a2a
tree4759b1bc65e703213178d7ab4ef7c1a80e713161
parenta15b6f1606e1c761c2c4037b734137e97f00489f
parent68a2c547d00d7a8d0c15744172489d9d010c31a3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)