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

Conflicts:
	libraries/structure.lib.php
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin