diff -ruN /usr/share/php/symfony/debug/sfWebDebug.class.php /tmp/symfony.new/symfony/debug/sfWebDebug.class.php
--- /usr/share/php/symfony/debug/sfWebDebug.class.php	2007-05-30 11:19:13.227148669 +0200
+++ /tmp/symfony.new/symfony/debug/sfWebDebug.class.php	2007-05-30 11:18:07.667148669 +0200
@@ -371,6 +371,10 @@
     foreach ($config as $key => $value)
     {
       $result .= '<li class="is'.$value.''.($key == 'syck' ? ' last' : '').'">'.$key.'</li>';
+      if ($key=='xdebug' && $value=='on')
+      {
+        $result .= '<li class="is'.(sfConfig::get('sf_xdebug_logging') ? 'on' : 'off').'">xdebug_logging</li>';
+      }
     }
     $result .= '</ul>';
 
diff -ruN /usr/share/php/symfony/log/sfLogger/sfWebDebugLogger.class.php /tmp/symfony.new/symfony/log/sfLogger/sfWebDebugLogger.class.php
--- /usr/share/php/symfony/log/sfLogger/sfWebDebugLogger.class.php	2007-05-30 11:19:37.227148669 +0200
+++ /tmp/symfony.new/symfony/log/sfLogger/sfWebDebugLogger.class.php	2007-05-30 11:18:21.317148669 +0200
@@ -51,7 +51,7 @@
 
     // if we have xdebug, add some stack information
     $debug_stack = array();
-    if (function_exists('xdebug_get_function_stack'))
+    if (sfConfig::get('sf_xdebug_logging') && function_exists('xdebug_get_function_stack'))
     {
       foreach (xdebug_get_function_stack() as $i => $stack)
       {
 
diff -ruN /usr/share/php/data/symfony/skeleton/app/app/config/settings.yml /tmp/symfony.new/data/symfony/skeleton/app/app/config/settings.yml
--- /usr/share/php/data/symfony/skeleton/app/app/config/settings.yml	2007-05-30 11:18:37.887148669 +0200
+++ /tmp/symfony.new/data/symfony/skeleton/app/app/config/settings.yml	2007-05-30 11:17:54.067148669 +0200
@@ -7,6 +7,7 @@
     # E_ALL | E_STRICT = 4095
     error_reporting:        4095
     web_debug:              on
+    xdebug_logging:         on
     cache:                  off
     no_script_name:         off
     etag:                   off
@@ -74,6 +75,7 @@
 #    # Logging and debugging settings
 #    web_debug:              off       # Enable the web debug toolbar
 #    error_reporting:        341       # Determines which events are logged. The default value is E_PARSE | E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR | E_USER_ERROR = 341
+#    xdebug_logging:         off       # Enable xdebug stack trace in the logs, if xdebug is not available this has no effect.
 #
 #    # Assets paths
 #    rich_text_js_dir:       js/tiny_mce