From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 8 Sep 2008 02:54:13 +0000 (+1000)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
X-Git-Url: http://git.samba.org/?p=abartlet%2Fsamba.git%2F.git;a=commitdiff_plain;h=3eb6f79a02de6820581b91f8d9be80b8dd620119

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)
---

3eb6f79a02de6820581b91f8d9be80b8dd620119