Merged revisions 297245 via svnmerge from

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

................
  r297245 | russell | 2010-12-02 07:20:19 -0600 (Thu, 02 Dec 2010) | 20 lines

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

  ................
    r297229 | russell | 2010-12-02 07:16:47 -0600 (Thu, 02 Dec 2010) | 13 lines

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

    ........
      r297228 | russell | 2010-12-02 07:16:15 -0600 (Thu, 02 Dec 2010) | 6 lines

      Add "DAHDI" to a couple of app_meetme error messages.

      This is in response to some questions on IRC.  To the user, there was nothing
      that made it obvious that this error had anything to do with DAHDI not being
      loaded.
    ........
  ................
................

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