From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 20 Oct 2008 19:35:10 +0000 (+0200)
Subject: Merge branch 'master' of git://git.samba.org/samba
X-Git-Tag: samba-4.0.0alpha6~778^2~5^2~3
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1

Merge branch 'master' of git://git.samba.org/samba

Conflicts:
	source3/include/proto.h
---

d36edccc00452ff059a2e0ab5b7c4b68cb84eeb1