Merged revisions 4517-4518 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ................ r4529 | tzafrir | 2008-09-09 09:35:41 -0700 (Tue, 09 Sep 2008) | 8 lines xpp-zaptel: FXO: Add caller-id workaround for ESTI-DTMF (for #9096) * Also rename the CID_STYLE_* constants to formal names.