Merged revisions 370430,370432 via svnmerge from

Merged revisions 370430,370432 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r370430 | kpfleming | 2012-07-24 11:54:01 -0500 (Tue, 24 Jul 2012) | 5 lines

  Rewrite a comment that didn't adequately explain the code it was documenting.
  ........

  Merged revisions 370429 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r370432 | tzafrir | 2012-07-24 12:08:40 -0500 (Tue, 24 Jul 2012) | 4 lines

  chan_oss: fix "sample rate" error message

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

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