Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:02:17 +0000 (16:02 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:02:17 +0000 (16:02 +0200)
commit30ccc36b8d61f2d09c3f0adeec4db0ab540619b8
tree740fd5c06ebffb4991ede45182447d317603d115
parentadc09857420c4a9306148e8d15ff5faf633ba7a5
parentc26387a473fd26ac51c74c001b520d7fd7d353ec
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange

Conflicts:

source/headermap.txt
(This used to be commit 1b084e85c1f5963d924f7764ae751f8cd8e57364)
source4/headermap.txt
source4/pidl/config.m4