Merged revisions 374728 via svnmerge from

Merged revisions 374728 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r374728 | rmudgett | 2012-10-08 17:29:47 -0500 (Mon, 08 Oct 2012) | 15 lines

  dahdi.conf.sample: Add description for "buffers" setting.

  This contains an edited version of the patch originally uploaded by John
  Bigelow.

  (closes issue ASTERISK-14435)
  Reported by: John Bigelow
  Patches:
        buffers.patch (license #5091) patch uploaded by John Bigelow
        0001-dahdi.conf.sample-Add-description-for-buffers-settin.patch (license #5417) patch uploaded by Shaun Ruffell
        Modified
  ........

  Merged revisions 374727 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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