Blocked revisions 130042 via svnmerge

........
r130042 | kpfleming | 2008-07-11 11:08:03 -0500 (Fri, 11 Jul 2008) | 5 lines

new installations should be using DAHDI instead of Zaptel, so the sample config file is now chan_dahdi.conf instead of zapata.conf

also, convert remaining references to zapata.conf in various places


........


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