[Phpmyadmin-devel] Re: Bad merge in cvs