Merged revisions 261736 via svnmerge from

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

................
  r261736 | jpeeler | 2010-05-06 15:11:53 -0500 (Thu, 06 May 2010) | 15 lines

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

  ........
    r261735 | jpeeler | 2010-05-06 15:10:59 -0500 (Thu, 06 May 2010) | 8 lines

    Only allow the operator key to be accepted after leaving a voicemail.

    Or rather disallow the operator key from being accepted when not offered,
    such as after finishing a recording from within the mailbox options menu.

    ABE-2121
    SWP-1267
  ........
................

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