From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Oct 2008 16:04:16 +0000 (+0200)
Subject: Merge branch 'master' of git://git.samba.org/samba
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=d70efa57ceae1011a6a55d57d0152fd1bc2bb192

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

Conflicts:
	lib/util/asn1_proto.h
---

d70efa57ceae1011a6a55d57d0152fd1bc2bb192