---- phpMyAdmin-2.11.0-all-languages.orig/libraries/config.default.php 2007-08-22 20:04:58.000000000 +0200
-+++ phpMyAdmin-2.11.0-all-languages/libraries/config.default.php 2007-08-22 20:05:57.000000000 +0200
-@@ -141,14 +141,14 @@
- *
- * @global string $cfg['Servers'][$i]['auth_type']
- */
--$cfg['Servers'][$i]['auth_type'] = 'config';
-+$cfg['Servers'][$i]['auth_type'] = 'cookie';
-
- /**
- * MySQL user
+diff -burNp phpMyAdmin-3.1.0-all-languages/libraries/config.default.php phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php
+--- phpMyAdmin-3.1.0-all-languages/libraries/config.default.php 2008-11-28 14:21:00.000000000 +0100
++++ phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php 2008-12-02 10:31:40.200149063 +0100
+@@ -180,7 +180,7 @@ $cfg['Servers'][$i]['auth_swekey_config'
*
* @global string $cfg['Servers'][$i]['user']
*/