Blocked revisions 280812 via svnmerge

................
  r280812 | tilghman | 2010-08-03 15:52:20 -0500 (Tue, 03 Aug 2010) | 16 lines

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

  ........
    r280811 | tilghman | 2010-08-03 15:49:10 -0500 (Tue, 03 Aug 2010) | 9 lines

    Prevent DAHDI channels from overriding the callerid, once it's been set by the user.

    (closes issue #16661)
     Reported by: jstapleton
     Patches:
           20100414__issue16661.diff.txt uploaded by tilghman (license 14)
           20100415__issue16661__1.6.2.diff.txt uploaded by tilghman (license 14)
     Tested by: jstapleton
  ........
................

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