toward 1.0.8 -- svn conflict workaround

git-svn-id: https://plugins.svn.wordpress.org/swfput/trunk@883055 b8457f37-d9ea-0310-8a92-e5e31aec5664
toward 1.0.8 -- svn conflict workaround, next stage

git-svn-id: https://plugins.svn.wordpress.org/swfput/trunk@883056 b8457f37-d9ea-0310-8a92-e5e31aec5664