no need to bring this in 1.4, it is just code cleanup git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43439 65c4cc65-6c06-0410-ace0-fbb531ad65f3