From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 5 Mar 2008 18:42:15 +0000 (+0100)
Subject: Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
X-Git-Tag: samba-4.0.0alpha6~801^2~3573
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=63036a6f3380652c0cb54627bdeabcd212fa2f8c

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

63036a6f3380652c0cb54627bdeabcd212fa2f8c