Merged revisions 186444,186447 via svnmerge from

Merged revisions 186444,186447 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186444 | tilghman | 2009-04-03 14:30:34 -0500 (Fri, 03 Apr 2009) | 14 lines

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

  ........
    r186415 | tilghman | 2009-04-03 14:06:58 -0500 (Fri, 03 Apr 2009) | 7 lines

    Distinguish in a sent email between simple sends and forwards.
    (closes issue #11678)
     Reported by: jamessan
     Patches:
           20090330__bug11678.diff.txt uploaded by tilghman (license 14)
     Tested by: tilghman, lmadsen
  ........
................
  r186447 | tilghman | 2009-04-03 14:59:55 -0500 (Fri, 03 Apr 2009) | 9 lines

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

  ........
    r186445 | tilghman | 2009-04-03 14:56:48 -0500 (Fri, 03 Apr 2009) | 2 lines

    Found a conflict in the last commit, due to multiple targets
  ........
................

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