Merged revisions 252533 via svnmerge from

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

........
  r252533 | lmadsen | 2010-03-15 15:48:56 -0500 (Mon, 15 Mar 2010) | 7 lines
  
  Update extensions.ael file to not overlap extensions.conf.
  Updated the extensions.ael file so the global variables don't overlap
  those that we have in extensions.conf (sample files). This way unexpected
  things won't happed hopefully if both pbx_ael and res_config are loaded.
  
  (closes issue #17035)
  Reported by: pprindeville
........


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