From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 30 Jun 2008 09:34:11 +0000 (+1000)
Subject: Merge branch '4-0-local' into v4-0-stable
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=91643773b8ff0727b40a230b7c41288f57e6a9cb

Merge branch '4-0-local' into v4-0-stable
(This used to be commit dc238848b3987a187212bd8088916c5b34755b0f)
---

91643773b8ff0727b40a230b7c41288f57e6a9cb