diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 51306db495de36bc51c3d3fbe5805034b8c98a75..90d69207e6fa3c0540a2bdd77e237ba6bf111b88 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added Serbia and Montenegro to the country_select #1239 [todd@robotcoop.com]
+
 * Fixed Request#remote_ip in testing #1251 [bitsweat]
 
 * Fixed that compute_public_path should recognize external URLs, so image_tag("http://www.example.com/images/icon.gif") is not prefixed with the relative url path #1254 [victor-ronr-trac@carotena.net]
diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb
index 02c705a2b4e05f65134f91d0e69351819239a0a1..1a2423b1e24ac693d0f8cfbe88718a68a5698a81 100644
--- a/actionpack/lib/action_controller/filters.rb
+++ b/actionpack/lib/action_controller/filters.rb
@@ -339,10 +339,10 @@ def filter_class?(filter)
 
         def action_exempted?(filter)
           case
-            when self.class.included_actions[filter]
-              !self.class.included_actions[filter].include?(action_name)
-            when self.class.excluded_actions[filter] 
-              self.class.excluded_actions[filter].include?(action_name)
+            when ia = self.class.included_actions[filter]
+              !ia.include?(action_name)
+            when ea = self.class.excluded_actions[filter] 
+              ea.include?(action_name)
           end
         end
     end