Merged revisions 262422 via svnmerge from

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

................
  r262422 | qwell | 2010-05-11 14:57:24 -0500 (Tue, 11 May 2010) | 18 lines

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

  ........
    r262421 | qwell | 2010-05-11 14:55:42 -0500 (Tue, 11 May 2010) | 11 lines

    Use a less silly method for modifying a flex-generated file.

    The sed syntax that was used wasn't actually valid, causing some versions to
    choke.  This is the method that is used in 1.6.x+ for similar changes.

    (closes issue #16696)
    Reported by: bklang
    Patches:
          16696-sedfix.diff uploaded by qwell (license 4)
    Tested by: qwell
  ........
................

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