Merge branch 'singlereplace' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:45:10 +0000 (16:45 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:45:10 +0000 (16:45 +0200)
commitbf21371c098684ccad427a54ac76766c0021bc88
treeed1d0dce7dda8d41c6dcefdfe23eea35df1ced0c
parentf957aeaee64745148b815393b1fc1338104ed2e1
parent0888ffa2b7382a1c4781ae54bad53eac3b229365
Merge branch 'singlereplace' into single

Conflicts:
source4/configure.ac
source4/torture/local/config.mk
source3/configure.in
source3/include/includes.h
source4/configure.ac
source4/torture/local/config.mk