Merged revisions 91292 via svnmerge from

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

........
r91292 | mmichelson | 2007-12-05 16:57:13 -0600 (Wed, 05 Dec 2007) | 3 lines

Reverting extra stuff I didn't mean to commit


........


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