Merged revisions 291791 via svnmerge from

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

........
  r291791 | jpeeler | 2010-10-14 13:45:02 -0500 (Thu, 14 Oct 2010) | 10 lines
  
  Add missing ifdefs for test framework and new locale code.
  
  (closes issue #18137)
  Reported by: ovi
  Patches: 
        18137_test_framework_ifdef.patch uploaded by wdoekes (license 717)
        18137_localelist_warning.patch uploaded by wdoekes (license 717)
  Tested by: ovi
........


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