Rails 2.2.2

Updated to Rails 2.2.2.
Added a couple more Ruby 1.9 fixes, but that's pretty much at a standstill,
until one gets Maruku and HTML5lib working right under Ruby 1.9.

vendor/rails/actionpack/lib/action_view/renderable.rb

@@ -25,20 +25,28 @@ module ActionView
     def render(view, local_assigns = {})
       compile(local_assigns)
 
-      view.send(:_first_render=, self) unless view.send(:_first_render)
-      view.send(:_last_render=, self)
+      stack = view.instance_variable_get(:@_render_stack)
+      stack.push(self)
+
+      # This is only used for TestResponse to set rendered_template
+      unless is_a?(InlineTemplate) || view.instance_variable_get(:@_first_render)
+        view.instance_variable_set(:@_first_render, self)
+      end
 
       view.send(:_evaluate_assigns_and_ivars)
       view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
 
-      view.send(method_name(local_assigns), local_assigns) do |*names|
+      result = view.send(method_name(local_assigns), local_assigns) do |*names|
         ivar = :@_proc_for_layout
-        if view.instance_variable_defined?(ivar) and proc = view.instance_variable_get(ivar)
+        if !view.instance_variable_defined?(:"@content_for_#{names.first}") && view.instance_variable_defined?(ivar) && (proc = view.instance_variable_get(ivar))
           view.capture(*names, &proc)
         elsif view.instance_variable_defined?(ivar = :"@content_for_#{names.first || :layout}")
           view.instance_variable_get(ivar)
         end
       end
+
+      stack.pop
+      result
     end
 
     def method_name(local_assigns)