Merged revisions 165319 via svnmerge from

Merged revisions 165319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r165319 | tilghman | 2008-12-17 15:18:57 -0600 (Wed, 17 Dec 2008) | 11 lines

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

  ........
    r165317 | tilghman | 2008-12-17 15:14:37 -0600 (Wed, 17 Dec 2008) | 4 lines

    Reverse the fix from issue #6176 and add proper handling for that issue.
    (Closes issue #13962, closes issue #13363)
    Fixed by myself (license 14)
  ........
................

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