Merged revisions 325877 via svnmerge from

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

........
  r325877 | mjordan | 2011-06-30 15:09:48 -0500 (Thu, 30 Jun 2011) | 9 lines
  
  Patched voicemail user option for emailbody / emailsubject
  
  Incorporated changes per ASTERISK-16795; updated unit tests to check for vmu->emailbody / vmu->emailsubject
  
  (closes issue ASTERISK-16795)
  Reported by: mdeneen
  Tested by: mjordan
........


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