fixes in RC related to incorrect merge
SWF Uploader
This commit was manufactured by cvs2svn to create branch
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.