Merged revisions 334013 via svnmerge from

Merged revisions 334013 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334013 | rmudgett | 2011-08-31 11:00:49 -0500 (Wed, 31 Aug 2011) | 30 lines

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

  ........
    r334012 | rmudgett | 2011-08-31 10:57:12 -0500 (Wed, 31 Aug 2011) | 23 lines

    No DAHDI channel available for conference, user introduction disabled.

    The following error will consistently occur when trying to dial into a
    MeetMe conference when the server does not have DAHDI hardware installed:

    app_meetme.c: No DAHDI channel available for conference, user introduction
    disabled (is chan_dahdi loaded?)

    While chan_dahdi is loaded correctly during compilation and install of
    Asterisk/Dahdi, including associated modules, etc., a chan_dahdi.conf
    configuration file in /etc/asterisk is not created by FreePBX if hardware
    does not exist, causing MeetMe to be unable to open a DAHDI pseudo
    channel.

    * Allow chan_dahdi to create a pseudo channel when there is no
    chan_dahdi.conf file to load.

    (closes issue ASTERISK-17398)
    Reported by: Preston Edwards
    Patches:
          jira_asterisk_17398_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: rmudgett
  ........
................

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