r4668
Merge branch 'master' of /space/vdist/red5-server-svn