Merged revisions 48372 via svnmerge from

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

................
r48372 | murf | 2006-12-09 20:04:18 -0700 (Sat, 09 Dec 2006) | 9 lines

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

........
r48371 | murf | 2006-12-09 19:14:13 -0700 (Sat, 09 Dec 2006) | 1 line

This version applies the patch suggested by stevens in bug 7836 (make inbound channel RINGING state consistent with other channels).
........

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

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