Merged revisions 53097 via svnmerge from

Merged revisions 53097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r53097 | file | 2007-02-01 15:54:28 -0600 (Thu, 01 Feb 2007) | 10 lines

Merged revisions 53095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53095 | file | 2007-02-01 15:47:11 -0600 (Thu, 01 Feb 2007) | 2 lines

Don't negotiate RFC2833 when not configured to do so. (issue #8799 reported by mdu113)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53098 65c4cc65-6c06-0410-ace0-fbb531ad65f3