From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 30 Jul 2008 21:48:16 +0000 (+1000)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
X-Git-Tag: samba-4.0.0alpha6~801^3~95^2~20
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=337752cfd82dc3dbdf918fd45eddd1aa8fb04576;p=samba.git

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 15d0951b74b46763024560f9cd012338473c5bc3)
---

337752cfd82dc3dbdf918fd45eddd1aa8fb04576