Merge branch 'master' of git://git.freeswitch.org/freeswitch

Conflicts:
	conf/autoload_configs/modules.conf.xml
	libs/freetdm/src/ftdm_sched.c
	libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c

diff --cc Freeswitch.2008.sln
Simple merge

diff --cc build/modules.conf.in
Simple merge

diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
Simple merge