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 09:55:19 +0000 (11:55 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 14 Apr 2008 09:55:19 +0000 (11:55 +0200)
commit7cf29ac84e2f45dfc56d5e46678a96527a38a1c1
treed4b3755cd8acebfc0736de7ae03b68a5cbf35dd0
parentf78bc8c489b02b521e9ecbdbdc72d160c6911b6b
parent7361899e80c1001eb7d7c13b12ba72cbc3b758f2
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 9d3d64e1387e9f20383c255bba27128cf4b9519e)