SVN commit 478136 by cartman: small fixes M +44 -47 channel.cpp