Merged revisions 316831 via svnmerge from

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

........
  r316831 | rmudgett | 2011-05-04 13:51:40 -0500 (Wed, 04 May 2011) | 9 lines

  Wait for leader with Music On Hold allows crosstalk between participants.

  Parenthesis in the wrong position.  Regression from issue #14365 when
  expanding conference flags to use 64 bits.

  (closes issue #18418)
  Reported by: MrHanMan
  Tested by: rmudgett
........

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