Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 19:35:10 +0000 (21:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 19:35:10 +0000 (21:35 +0200)
commitd36edccc00452ff059a2e0ab5b7c4b68cb84eeb1
treecbf55ec9969235754fee3b1264d4e775476ead75
parent2c1b1255c2dc095013863a1d99b750e8506237fa
parentbc9bbda8b390a221d7b88fd6eb1b54efc8c91c6b
Merge branch 'master' of git://git.samba.org/samba

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