merged pull requests #6 and #7 on github

git-svn-id: http://svn.coderepos.org/share/lang/perl/Encode/trunk@39210 d0d07461-0603-4401-acd4-de1884942a52
merged pull request #6 on github

git-svn-id: http://svn.coderepos.org/share/lang/perl/Encode/trunk@39211 d0d07461-0603-4401-acd4-de1884942a52