Merge branch 'davidy.mapped_raw_traces'

author David Yat Sin <dyatsin@sangoma.com>

Wed, 15 Dec 2010 21:45:15 +0000 (16:45 -0500)

committer David Yat Sin <dyatsin@sangoma.com>

Wed, 15 Dec 2010 21:45:15 +0000 (16:45 -0500)
author David Yat Sin <dyatsin@sangoma.com>
Wed, 15 Dec 2010 21:45:15 +0000 (16:45 -0500)
committer David Yat Sin <dyatsin@sangoma.com>
Wed, 15 Dec 2010 21:45:15 +0000 (16:45 -0500)
diff --cc libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
Simple merge
author	David Yat Sin <dyatsin@sangoma.com>
	Wed, 15 Dec 2010 21:45:15 +0000 (16:45 -0500)
committer	David Yat Sin <dyatsin@sangoma.com>
	Wed, 15 Dec 2010 21:45:15 +0000 (16:45 -0500)