diff --git a/.cvsignore b/.cvsignore
index eb8a84d5a..c221041d0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 ChangeLog_till_2.2.6.tar.gz
+config.inc.developer.php3
diff --git a/ChangeLog b/ChangeLog
index 7fdd4ca71..3d2bfd1ef 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-05-09 Robin Johnson  <robbat2@users.sourceforge.net>
+    * .cvsignore, libraries/common.lib.php3: Feature to stop developers 
+      commiting their config.inc.php3 so easily.
+
 2002-05-09 Alexander M. Turek  <rabus@users.sourceforge.net>
     * left.php3, libraries/common.lib.php3:
       Fixed bug #546011 (Navigation tooltips).
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 6c97754f1..8d51836a3 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -63,16 +63,19 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
         $pos              = 0;
     }
 
-
     /**
      * Parses the configuration file and gets some constants used to define
      * versions of phpMyAdmin/php/mysql...
      */
     include('./config.inc.php3');
 
-    // For compatibility with old config.inc.php3
-    if (!isset($cfg)) {
-        include('./config_import.inc.php3');
+    /**
+     * Reads in the developer edition config file. This is used exclusively during
+     * the development cycle of PMA, to prevent the accident of the developers ever
+     * submitting their config.inc.php3 file.
+     */
+    if (file_exists('./config.inc.developer.php3')) {
+        include('./config.inc.developer.php3');
     }
 
     /**
@@ -84,6 +87,11 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
      */
     include('./libraries/defines.lib.php3');
 
+    // For compatibility with old config.inc.php3
+    if (!isset($cfg)) {
+        include('./config_import.inc.php3');
+    }
+
     // If zlib output compression is set in the php configuration file, no
     // output buffering should be run
     if (PMA_PHP_INT_VERSION < 40000