Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:03:54 +0000 (18:03 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 17:03:54 +0000 (18:03 +0100)
commitfc2cd5ed638b7b3b0ab2cef21ba032d7d958a0c2
treec343b97a8c16fcacd7703adcf4ee6f84fa7ee2a1
parent5a5b50f3dd7d75214184f711c35a7536b64cbbe7
parent97a272a4bf1178c1adcc5761d162b74c338dd230
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit e4da851bd7e7620bbf99efe20a496b1be78ba4e2)