Merged revisions 289178 via svnmerge from

Merged revisions 289178 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r289178 | mnicholson | 2010-09-29 10:04:11 -0500 (Wed, 29 Sep 2010) | 15 lines

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

  ........
    r289177 | mnicholson | 2010-09-29 10:03:27 -0500 (Wed, 29 Sep 2010) | 8 lines

    Set the caller id on CDRs when it is set on the parent channel.

    (closes issue #17569)
    Reported by: tbelder
    Patches:
          17569.diff uploaded by tbelder (license 618)
    Tested by: tbelder
  ........
................

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