Merged revisions 300951 via svnmerge from

Merged revisions 300951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r300951 | jpeeler | 2011-01-07 11:23:37 -0600 (Fri, 07 Jan 2011) | 14 lines

  Merged revisions 300918 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r300918 | jpeeler | 2011-01-07 11:13:21 -0600 (Fri, 07 Jan 2011) | 7 lines

    Ensure good bye prompt in voicemail is played at the correct time.

    Specifically in the case of timing out but not leaving voicemail nothing
    should be heard. And when leaving voicemail it should be heard.

    ABE-2647
  ........
................

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