Merged revisions 332877 via svnmerge from

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

................
  r332877 | pabelanger | 2011-08-22 15:43:33 -0400 (Mon, 22 Aug 2011) | 13 lines
  
  Merged revisions 332876 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r332876 | pabelanger | 2011-08-22 15:41:24 -0400 (Mon, 22 Aug 2011) | 6 lines
    
    Revert previous commit
    
    It seems google is still making changes to the protocol.
    
    (issue ASTERISK-18301)
  ........
................


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