diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 83a7187e40..c7cac84206 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Abbreviate RAILS_ROOT in traces
+
+
 *1.10.1* (October 19th, 2005)
 
 * Update error trace templates [Nicholas Seckar]
diff --git a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
index 8175fbf18e..c773230f09 100644
--- a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
@@ -4,9 +4,14 @@
     ["Framework Trace", @exception.framework_backtrace],
     ["Full Trace", @exception.clean_backtrace]
   ]
+  if defined?(RAILS_ROOT)
+    traces.each { |name, trace| trace.map! { |p| p.gsub(/^#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
+  end
   names = traces.collect {|name, trace| name}
 %>
 
+<p><code>RAILS_ROOT: <%= RAILS_ROOT %></code></p>
+
 <div id="traces">
   <% names.each do |name| -%>
     <%