Blocked revisions 150557 via svnmerge

........
  r150557 | qwell | 2008-10-17 10:31:35 -0500 (Fri, 17 Oct 2008) | 9 lines
  
  Correctly allow chan_dahdi to compile against older versions of Zaptel.
  Don't always define HAVE_ZAPTEL_CHANALARMS (since we check if it's defined..)
  Minor cleanup to make things clear.
  
  (closes issue #13726)
  Reported by: tzafrir
  Patches:
        dahdi_def.diff uploaded by tzafrir (license 46)
........


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