From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Mar 2008 00:12:20 +0000 (+1100)
Subject: Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
X-Git-Tag: samba-4.0.0alpha6~801^3~433^2~5
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=4550c3f470c7e6cb1419f318231301df896a5d1c

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

4550c3f470c7e6cb1419f318231301df896a5d1c