Merged revisions 309126 via svnmerge from

Merged revisions 309126 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r309126 | rmudgett | 2011-03-01 12:44:05 -0600 (Tue, 01 Mar 2011) | 16 lines

  Chan_dahdi does not retain CID when detecting DTMF CID without polarity reversal.

  Looks like an unintended change when sig_analog.c was extracted from
  chan_dahdi.c.

  Removed useless conditional around needed code and fixed resulting
  compiler warning.

  (closes issue #18667)
  Reported by: enegaard
  Patches:
        issue18667.patch uploaded by enegaard (license 1197)
  Tested by: enegaard

  JIRA SWP-2965
........

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