From: Simo Sorce <idra@samba.org>
Date: Wed, 16 Jan 2008 17:06:34 +0000 (-0500)
Subject: Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
X-Git-Tag: samba-4.0.0alpha6~801^2~3880
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=04b2a9e80a8c35e37faf2e0a8e54efb9a084f2e3;p=samba.git

Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo
(This used to be commit 05c22a55a4c052c682a2f2afdb0696504195d18c)
---

04b2a9e80a8c35e37faf2e0a8e54efb9a084f2e3