Merged revisions 331579 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 11 Aug 2011 21:55:48 +0000 (21:55 +0000)
committerJason Parker <jparker@digium.com>
Thu, 11 Aug 2011 21:55:48 +0000 (21:55 +0000)
commit1a8069abe2fc18e20e1cf2626f4bfc9e2e6d56dc
tree79e2dcf72e64b556c3ee94e996fe6370cc6634a7
parente12184cf952d046e29b7aaa3354f4b080e022947
Merged revisions 331579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331579 | qwell | 2011-08-11 16:54:54 -0500 (Thu, 11 Aug 2011) | 13 lines

  Merged revisions 331578 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r331578 | qwell | 2011-08-11 16:46:39 -0500 (Thu, 11 Aug 2011) | 6 lines

    Use proper values for 64-bit option flags.

    Also, reusing bits es no bueno, so change the value of a duplicate.

    (issue ASTERISK-18239)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_dial.c
apps/app_meetme.c