go back to rev 4649
Merge branch 'master' of /space/vdist/red5-server-svn (back to rev4649)