Merge branch 'master' of /home/jelmer/samba3
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Nov 2008 03:02:47 +0000 (04:02 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 1 Nov 2008 03:02:47 +0000 (04:02 +0100)
commit31fa08dcbdc643ec738474c0be471e77925f76fc
treec4337b4bd77a31f4f593d8c94bbd15b796123117
parent5a56c0adf2c63602b819d052644cb14caf732438
parent7b186c48d365ae8eda81ae9a0af100d2214bee32
Merge branch 'master' of /home/jelmer/samba3

Conflicts:
lib/replace/README
lib/replace/libreplace.m4
lib/replace/replace.c
source3/include/proto.h
source3/lib/system.c
lib/replace/README
lib/replace/libreplace.m4
lib/replace/replace.c
lib/replace/replace.h
source3/include/proto.h
source3/lib/system.c