Merged revisions 331138 via svnmerge from

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

........
  r331138 | qwell | 2011-08-09 10:47:20 -0500 (Tue, 09 Aug 2011) | 1 line
  
  Revert merge of r306999, due to merge conflict.
........


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