[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 648ad3: Merge pull request #12 from alexukf/small_fixes