Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/base/mime_responds.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/abstract/base.rb b/actionpack/lib/action_controller/abstract/base.rb
index 1f2f096dae..0e4803388a 100644
--- a/actionpack/lib/action_controller/abstract/base.rb
+++ b/actionpack/lib/action_controller/abstract/base.rb
@@ -68,11 +68,11 @@ module AbstractController
       self.response_obj = {}
     end
     
-    def process(action_name)
-      @_action_name = action_name = action_name.to_s
+    def process(action)
+      @_action_name = action_name = action.to_s
 
       unless action_name = method_for_action(action_name)
-        raise ActionNotFound, "The action '#{action_name}' could not be found"
+        raise ActionNotFound, "The action '#{action}' could not be found"
       end
 
       process_action(action_name)