Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 15:11:13 +0000 (16:11 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 21 Feb 2008 15:11:13 +0000 (16:11 +0100)
commit52a8d06f00ab3900e2186e047902dbcbe3138a01
tree974ab652f39a5acaa45ae8357520d9c0e3dc7747
parentbf08b682586f6b9a17d4ec3934836be957ef955c
parentf5ff4a571cdf7d00d065f4a4996880020f1f459f
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial