Merged revisions 258776 via svnmerge from

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

................
  r258776 | tilghman | 2010-04-25 13:12:14 -0500 (Sun, 25 Apr 2010) | 13 lines

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

  ........
    r258775 | tilghman | 2010-04-25 13:09:05 -0500 (Sun, 25 Apr 2010) | 6 lines

    When StopMonitor is called, ensure that it will not be restarted by a channel event.
    (closes issue #16590)
     Reported by: kkm
     Patches:
           resmonitor-16590-trunk.239289.diff uploaded by kkm (license 888)
  ........
................

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