Merged revisions 130514 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130514 | tilghman | 2008-07-13 12:56:10 -0500 (Sun, 13 Jul 2008) | 4 lines

Reverting 2 changesets, as it breaks incoming IAX2 calls
(Related to issue #12963)
Reported by: mvanbaak

........


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