From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 26 Mar 2008 04:42:43 +0000 (+1100)
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~410^2~7
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=4bb658d5c8c8461169c827194139e599944a81ed;hp=-c

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

4bb658d5c8c8461169c827194139e599944a81ed