From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 29 May 2008 12:23:25 +0000 (+1000)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
X-Git-Tag: samba-4.0.0alpha6~801^3~287^2~8^2~3
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=2371de92a08a1fb63ba458bba3cee5a251419579;p=samba.git

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

2371de92a08a1fb63ba458bba3cee5a251419579