From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 15 Jan 2008 22:26:24 +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~645
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa

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

e02e67ec36ecc5f5af2fcf3a7c6b0282173df8aa