From: Alexander Bokovoy <ab@samba.org>
Date: Thu, 13 Dec 2007 09:57:24 +0000 (+0300)
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~4101^2~5
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=e25383400af26f10baff4d2b21db63f528ffbaeb

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

e25383400af26f10baff4d2b21db63f528ffbaeb