These changes are in a file that is not compiled by default, and so were
missed on earlier checks.
........

Merged revisions 351860 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 351861 from http://svn.asterisk.org/svn/asterisk/branches/10


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