From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 19 Dec 2008 22:55:45 +0000 (+0100)
Subject: Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
X-Git-Tag: samba-4.0.0alpha6~462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=759a3bcc88230c5232b748bb8f5a0c6e0cce128c;p=thirdparty%2Fsamba.git

Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba

Conflicts:
	source4/lib/ldb/ldb_wrap.c
---

759a3bcc88230c5232b748bb8f5a0c6e0cce128c