Merged revisions 334841 via svnmerge from

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

................
  r334841 | rmudgett | 2011-09-07 14:33:38 -0500 (Wed, 07 Sep 2011) | 17 lines

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

  ........
    r334840 | rmudgett | 2011-09-07 14:31:44 -0500 (Wed, 07 Sep 2011) | 10 lines

    Fix AMI action Park crash.

    * Made AMI action Park not say anything to the parker channel (AMI header
    Channel2) since the AMI action is a third party parking the call.  (This
    is a change in behavior that cannot be preserved without a lot of effort.)

    * Made not play pbx-parkingfailed if the Park 's' option is used.

    JIRA AST-660
  ........
................

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