Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 16:04:16 +0000 (18:04 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 16:04:16 +0000 (18:04 +0200)
commitd70efa57ceae1011a6a55d57d0152fd1bc2bb192
tree92ee7a3f33ea51f34a33fee094eaed651215a3d3
parent2f265feb174de1f743e8102ad34b3bdbcd2897cc
parentd805c714bb79a709716ec0373670283bfcd23c3c
Merge branch 'master' of git://git.samba.org/samba

Conflicts:
lib/util/asn1_proto.h
lib/util/config.mk