Merge branch 'singlepopt' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 15:20:54 +0000 (17:20 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 15:20:54 +0000 (17:20 +0200)
commit9ef623beda5d6a7507ff6c871117c8f88e547441
treedff1dc9cb6de1389a9aa18af51349e1fbef90b83
parenta347ab83f447d7921d5d427e56f6965342b25834
parentc8bff39df639c70afc94b1795c94629ee8b7b482
Merge branch 'singlepopt' into single

Conflicts:
source4/Makefile
source3/configure.in
source3/samba4.m4
source3/samba4.mk
source4/Makefile
source4/configure.ac