Merged revisions 338225 via svnmerge from

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

................
  r338225 | rmudgett | 2011-09-28 15:26:39 -0500 (Wed, 28 Sep 2011) | 12 lines

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

  ........
    r338224 | rmudgett | 2011-09-28 15:24:41 -0500 (Wed, 28 Sep 2011) | 5 lines

    Fix chan_dahd compiling with gcc 4.6 when PRI and SS7 not present.

    (closes issue ASTERISK-18357)
    Reported by: Matthew Nicholson
  ........
................

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