Merged revisions 336441 via svnmerge from

Merged revisions 336441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336441 | oej | 2011-09-19 14:15:06 +0200 (Mån, 19 Sep 2011) | 9 lines

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

  ........
    r336440 | oej | 2011-09-19 14:06:48 +0200 (Mån, 19 Sep 2011) | 2 lines

    Make sure manager_debug option is reset at reload
  ........
................

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