Merged revisions 259538 via svnmerge from

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

................
  r259538 | rmudgett | 2010-04-27 17:18:09 -0500 (Tue, 27 Apr 2010) | 18 lines

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

  ........
    r259531 | rmudgett | 2010-04-27 16:53:07 -0500 (Tue, 27 Apr 2010) | 11 lines

    DAHDI "WARNING" message is confusing and vague

    "WARNING[28406]: chan_dahdi.c:6873 ss_thread: CallerID feed failed: Success"

    Changed the warning to "Failed to decode CallerID on channel 'name'".  The
    message before it is likely more specific about why the CallerID decode
    failed.

    SWP-501
    AST-283
  ........
................

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