From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 17 Apr 2008 07:36:09 +0000 (+0200)
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~339^2~55^2~5
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=30b9c37420100c98df1a538673d508e46517accf;p=bbaumbach%2Fsamba-autobuild%2F.git

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

Conflicts:

	source/ntvfs/ntvfs_generic.c
(This used to be commit a626a9c69cb2c07c8de69dcfe45361f86d6de58d)
---

30b9c37420100c98df1a538673d508e46517accf