diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index c34b2f2cb403f44eb8813137a4ceee0a37452623..1fb95347d2a65c921c436b6ff478101b3b0f74a3 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,6 +1,6 @@
 *SVN*
 
-* Add descriptive messages to the exceptions thrown by cgi_methods. Closes #6091. [Nicholas Seckar]
+* Add descriptive messages to the exceptions thrown by cgi_methods. #6091, #6103 [Nicholas Seckar, Bob Silva]
 
 * Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids,  #6068 [petermichaux@gmail.com]
 
diff --git a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
index 16baa5abda1cb502616955a93f201b4ca16e82d3..3c2a1abbb6c73df0bba84e131a2269f527f83454 100755
--- a/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
+++ b/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb
@@ -192,9 +192,11 @@ def bind(key, value)
       end
       
       def type_conflict!(klass, value)
-        raise TypeError, "Conflicting types for parameter containers
-          Expected an instance of #{klass}, but found found one of #{value.class}"
+        raise TypeError, 
+          "Conflicting types for parameter containers. " +
+          "Expected an instance of #{klass}, but found an instance of #{value.class}. " +
+          "This can be caused by passing Array and Hash based paramters qs[]=value&qs[key]=value. "
       end
       
     end
-end
\ No newline at end of file
+end