Merged revisions 206636 via svnmerge from

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

................
  r206636 | seanbright | 2009-07-15 12:00:24 -0400 (Wed, 15 Jul 2009) | 9 lines

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

  ........
    r206635 | seanbright | 2009-07-15 11:57:51 -0400 (Wed, 15 Jul 2009) | 1 line

    Only print debug info in codec_dahdi if we are asking for it.
  ........
................

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