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)
commite4da851bd7e7620bbf99efe20a496b1be78ba4e2
tree2b77d024b18a5f49a38d0967e3fa0631311d43b2
parent391fea450b2e6664fcd4e4419858997c6094cf3e
parentd92597d29caf76e1c8d0858f066d7a30143392e9
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3