Merged revisions 60399 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60399 | kpfleming | 2007-04-06 09:49:51 -0500 (Fri, 06 Apr 2007) | 10 lines

Merged revisions 60398 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60398 | kpfleming | 2007-04-06 09:41:37 -0500 (Fri, 06 Apr 2007) | 2 lines

remove undocumented 'cardsmode' parameter and stop searching for transcoders during reload()

........

................


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