Merged revisions 269495 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 9 Jun 2010 22:19:20 +0000 (22:19 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 9 Jun 2010 22:19:20 +0000 (22:19 +0000)
commit403f9df8d062fac7a757d4e5148674e4c76c4649
treec6f11f4921af41aa59d99daecd5f17a9768681c3
parentdcc1b408b26199902265dffd00c6fa3c63f631f3
Merged revisions 269495 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r269495 | russell | 2010-06-09 17:18:37 -0500 (Wed, 09 Jun 2010) | 2 lines

  Don't stop Asterisk if chan_oss fails to register 'Console' (due to another channel driver already claiming it).
........

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