Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts:
	libraries/relation.lib.php

scripts/decode_bug.php

@@ -8,7 +8,6 @@
  *
  * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
  *
- * @version $Id$
  * @package phpMyAdmin-debug
  */
 

scripts/signon.php

@@ -7,7 +7,6 @@
  * not intended to be perfect code and look, only shows how you can
  * integrate this functionality in your application.
  *
- * @version $Id$
  * @package phpMyAdmin
  * @subpackage Example
  */

scripts/upgrade_tables_mysql_4_1_2+.sql

@@ -143,22 +143,3 @@ ALTER TABLE `pma_table_info`
   CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
 ALTER TABLE `pma_table_info`
   CHANGE `display_field` `display_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma_designer_coords`
---
-
-CREATE TABLE IF NOT EXISTS `pma_designer_coords` (
-  `db_name` varchar(64) NOT NULL default '',
-  `table_name` varchar(64) NOT NULL default '',
-  `x` INT,
-  `y` INT,
-  `v` TINYINT,
-  `h` TINYINT,
-  PRIMARY KEY (`db_name`,`table_name`)
-)
-  ENGINE=MyISAM COMMENT='Table coordinates for Designer'
-  DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-