[Phpmyadmin-devel] Bad merge in cvs