Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / app / views / trace / list.rhtml

<%= render :partial => 'trace_header' %>

<%= render :partial => 'trace_list' %>