Merged revisions 329204 via svnmerge from

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

................
  r329204 | rmudgett | 2011-07-21 13:05:18 -0500 (Thu, 21 Jul 2011) | 13 lines

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

  ........
    r329203 | rmudgett | 2011-07-21 13:04:09 -0500 (Thu, 21 Jul 2011) | 6 lines

    Document parkinglot in chan_dahdi.conf.sample.

    * Document existing feature in chan_dahdi.conf.sample.

    * Remove some dead code related to the parkinglot option.
  ........
................

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