Code cleanup
XHTML compliance
Wrap long line
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin