Merged revisions 220833 via svnmerge from

Merged revisions 220833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r220833 | jpeeler | 2009-09-29 11:58:29 -0500 (Tue, 29 Sep 2009) | 12 lines

  Make deletion of temporary greetings work properly with IMAP_STORAGE

  When imapgreetings was set to yes, the message was being deleted but wasn't
  actually being expunged. When imapgreetings was set to no, the file based
  message was not being deleted at all. All good now!

  (closes issue #14949)
  Reported by: noahisaac
  Patches:
        vm_tempgreeting_removal.patch uploaded by noahisaac (license 748),
        modified by me
........

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