From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 10 Jan 2008 22:25:14 +0000 (+1100)
Subject: Merge commit 'origin/v4-0-test' into 4-0-local
X-Git-Tag: samba-4.0.0alpha6~801^3~746
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=80902a2a2b14bc27af0f195d18c40ccef9cb780c

Merge commit 'origin/v4-0-test' into 4-0-local
(This used to be commit 4720f53a92644dd6959e18923924fbe01889111c)
---

80902a2a2b14bc27af0f195d18c40ccef9cb780c