Merge remote branch 'smgorig/master'

author Moises Silva <moy@sangoma.com>

Fri, 24 Sep 2010 18:15:32 +0000 (14:15 -0400)

committer Moises Silva <moy@sangoma.com>

Fri, 24 Sep 2010 18:15:32 +0000 (14:15 -0400)
author Moises Silva <moy@sangoma.com>
Fri, 24 Sep 2010 18:15:32 +0000 (14:15 -0400)
committer Moises Silva <moy@sangoma.com>
Fri, 24 Sep 2010 18:15:32 +0000 (14:15 -0400)
diff --cc libs/freetdm/src/include/private/ftdm_types.h
Simple merge
author	Moises Silva <moy@sangoma.com>
	Fri, 24 Sep 2010 18:15:32 +0000 (14:15 -0400)
committer	Moises Silva <moy@sangoma.com>
	Fri, 24 Sep 2010 18:15:32 +0000 (14:15 -0400)