diff --git a/ChangeLog b/ChangeLog
index 6e666dd6e..a327f19cf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2005-11-30 Michal Čihař  <michal@cihar.com>
     * lang/*: Messages for Sebastian.
+    * libraries/Config.class.php: Actually load configuration.
 
 2005-11-30 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/Config.class.php:
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4f41e0f98..4d85d2e03 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -329,6 +329,8 @@ class PMA_Config {
 
         $this->checkCollationConnection();
         //$this->checkPmaAbsoluteUri();
+        $this->settings = array_merge( $this->settings, $cfg );
+        return true;
     }
 
     /**
@@ -610,4 +612,4 @@ class PMA_Config {
      */
     function save() {}
 }
-?>
\ No newline at end of file
+?>