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)
commitac27a1451dfe5c0c957e93fdc84602c3c1c7deac
tree10a5af85ff2422ab8828a616bf709220e6222ff8
parent3b7940d531a30098ca9a09e9c83dc4d223d1fe8f
parent5fdca988c687f58fe2fddd3c8eff5f461207065b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3