Merged revisions 216092 via svnmerge from

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

................
  r216092 | russell | 2009-09-03 14:38:35 -0500 (Thu, 03 Sep 2009) | 16 lines

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

  ................
    r216085 | russell | 2009-09-03 14:36:46 -0500 (Thu, 03 Sep 2009) | 9 lines

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

    ........
      r216080 | russell | 2009-09-03 14:35:23 -0500 (Thu, 03 Sep 2009) | 2 lines

      Add a note about IAX2 to UPGRADE.txt.
    ........
  ................
................

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