Merged revisions 274595 via svnmerge from

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

................
  r274595 | rmudgett | 2010-07-07 13:20:00 -0500 (Wed, 07 Jul 2010) | 9 lines

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

  ........
    r274579 | rmudgett | 2010-07-07 13:12:41 -0500 (Wed, 07 Jul 2010) | 1 line

    Close the DAHDI FD on error when processing chan_dahdi toneduration config parameter.
  ........
................

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