Fixed Bug #4184
Merge branch 'bug-#4184' of git://github.com/lakshit/phpmyadmin into integration