Merged revisions 115279 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115279 | file | 2008-05-03 22:50:59 -0300 (Sat, 03 May 2008) | 2 lines

For my next trick I will make these work with what our autoconf header file gives us.

........


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