From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 28 Jan 2008 05:39:03 +0000 (+1100)
Subject: Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
X-Git-Tag: samba-4.0.0alpha6~801^3~642
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67

Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
---

c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67