Merged revisions 219721 via svnmerge from

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

................
  r219721 | dvossel | 2009-09-21 11:59:05 -0500 (Mon, 21 Sep 2009) | 9 lines

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

  ........
    r219720 | dvossel | 2009-09-21 11:55:53 -0500 (Mon, 21 Sep 2009) | 3 lines

    Reverting merge 219520. This change was not necessary.
  ........
................

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