Merged revisions 226890 via svnmerge from

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

................
  r226890 | file | 2009-11-02 14:08:54 -0400 (Mon, 02 Nov 2009) | 18 lines

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

  ........
    r226889 | file | 2009-11-02 14:08:11 -0400 (Mon, 02 Nov 2009) | 11 lines

    Fix a bug where the recorded privacy introduction file would not get removed if the caller hung up
    while the called party had not yet answered.

    This was fixed by introducing an argument to the 'n' option which, when enabled, removes the introduction
    file under all scenarios. This was done to preserve the behavior that has existed for quite some time.

    (closes issue #14674)
    Reported by: ulogic
    Patches:
          bug14674.patch uploaded by jpeeler (license 325)
  ........
................

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