From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 5 Feb 2009 15:39:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba
X-Git-Tag: samba-4.0.0alpha7~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d139ca4680abcbda5110f2f0886aa038ff62088;p=thirdparty%2Fsamba.git

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

Conflicts:
	librpc/ndr.pc.in
---

6d139ca4680abcbda5110f2f0886aa038ff62088