From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 30 Jan 2008 00:47:52 +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~640
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=3231717e1485c70890c23fbfc3087d970a408815

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

3231717e1485c70890c23fbfc3087d970a408815