Merged revisions 202497 via svnmerge from

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

................
  r202497 | russell | 2009-06-22 15:11:04 -0500 (Mon, 22 Jun 2009) | 11 lines

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

  ........
    r202496 | russell | 2009-06-22 15:08:53 -0500 (Mon, 22 Jun 2009) | 4 lines

    Report CallerID change during a masquerade.

    Reported by: markster
  ........
................

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