Merge remote branch 'origin/davidy.ftdm_variables3' into netborder.tmp

diff --cc libs/freetdm/Makefile.am
Simple merge

diff --cc libs/freetdm/msvc/freetdm.2008.vcproj
Simple merge

diff --cc libs/freetdm/msvc/freetdm.2010.vcxproj
Simple merge

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge

diff --cc libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index 4a817482e341f5178f5f6b1d5db51e6c0a5e2dfb,eb7df35ba08ff75eca1fb134063566b6cca43ed4..46eb92fededbab9b2671bf136a768ab4951c0cff
mode 100755,100644..100755
--- 1/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
--- 2/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c

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

diff --cc libs/freetdm/src/include/freetdm.h
index b1bcd46ae59460f953286245c0b4ae4dee9c6831,a34a2ca1886343d5ecb754cccfdb3caea7e29b25..32b100319d7f2024e56e14dfb54c84c7e5003b4b
mode 100755,100644..100755
--- 1/libs/freetdm/src/include/freetdm.h
--- 2/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h