Merged revisions 242719 via svnmerge from

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

................
  r242719 | tilghman | 2010-01-24 23:30:33 -0600 (Sun, 24 Jan 2010) | 9 lines

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

  ........
    r242683 | tilghman | 2010-01-24 23:13:28 -0600 (Sun, 24 Jan 2010) | 2 lines

    Make the build of the Asterisk expression parser match that of the AEL parser.
  ........
................

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