Merged revisions 321537 via svnmerge from

Merged revisions 321537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321537 | bbryant | 2011-06-01 16:10:02 -0400 (Wed, 01 Jun 2011) | 8 lines

  This patch fixes an issue with using the wrong voicemail folders with greetings.

  (closes issue #17871)
  Reported by: edhorton
  Patches:
        digium_bug_17871_2 uploaded by fhackenberger (license 592)
  Tested by: edhorton, fhackenberger
........

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