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 22:02:36 +0000 (23:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 7 Mar 2008 22:02:36 +0000 (23:02 +0100)
commit87abb775ce9a7610341ff8f06d1c482e72e6fd6d
tree6d74ffa4dbc967cd0f05a7182ca78f78d54dafdb
parent6a1f56d82a367a2f037e18ed346cf7cce7f377e0
parentdb669e1eb13effb08b1111405587c8c6dde95954
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit ac27a1451dfe5c0c957e93fdc84602c3c1c7deac)