r4660
Merge branch 'master' of /space/vdist/red5-server-svn r4660
rev4666
to rev4666