Updated to 3.1.2 from http://plugins.svn.wordpress.org/hana-flv-player/tags/3.1.2/
Merge branch '3.1.2'