Merged revisions 182882 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 18 Mar 2009 11:40:11 +0000 (11:40 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 18 Mar 2009 11:40:11 +0000 (11:40 +0000)
commit4f390ec0242b7e267d17fec6063b6061cca1324b
tree6a906b195b0036da59a9a5996a32f6f1e67a5f2b
parenta5c2ac4fc22ab4be5e4d3248bdfb5872321aff6a
Merged revisions 182882 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r182882 | kpfleming | 2009-03-18 06:31:41 -0500 (Wed, 18 Mar 2009) | 3 lines

  fix another symbol namespace issue (reported by Andrew on asterisk-dev)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_dahdi.c
include/asterisk/callerid.h
main/callerid.c