From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 11 Feb 2008 12:10:11 +0000 (+0100)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
X-Git-Tag: samba-4.0.0alpha6~801^3~577^2~1
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=e4165448d778db1721b1c7670b25ae3e40917d86

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

e4165448d778db1721b1c7670b25ae3e40917d86