Merged revisions 334747 via svnmerge from

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

................
  r334747 | schmidts | 2011-09-07 15:10:37 +0000 (Wed, 07 Sep 2011) | 9 lines

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

  ........
    r334682 | schmidts | 2011-09-07 13:26:50 +0000 (Wed, 07 Sep 2011) | 3 lines

    Adding the Feature to sent a Reason Header in a SIP Cancel message by set the flag AST_FLAG_ANSWERED_ELSEWHERE before doing a masquerade in the pickup function.
  ........
................

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