Conflicts:
	src/mod/applications/mod_conference/mod_conference.c

Calling ton and caller ton is not parsed at all in libpri signaling module
Patched-by: Markus Schräder

FS-5832 --resolve this should dedicate the interfaces per box assuming the hostnames on the box are distinct and the switchname param is set to be identical on the 2 boxes allowing the hostname as the sep key for the box-specific tables, the aliases table is still shared and sticky aliases should be used to keep them in tact.

FS-5826 - seems to improve behavior, possibility of issue with FS-5180, but not enough details on that problem to tell. Current symptom is definitely measurable though. --resolve

ref: http://www.plug.org/pipermail/plug/2005-June/002144.html