Merged revisions 168615 via svnmerge from

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

................
  r168615 | seanbright | 2009-01-14 15:58:26 -0500 (Wed, 14 Jan 2009) | 16 lines

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

  ........
    r168614 | seanbright | 2009-01-14 15:52:00 -0500 (Wed, 14 Jan 2009) | 9 lines

    Update autosupport script to supply info for both Zaptel and DAHDI in 1.4 and
    be sure to run dahdi_test in 1.6.x and trunk instead of zttest.

    (closes issue #14132)
    Reported by: dsedivec
    Patches:
          asterisk-1.4-autosupport.patch uploaded by dsedivec (license 638)
          asterisk-trunk-autosupport.patch uploaded by dsedivec (license 638)
  ........
................

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