gistfile1.txt

iff --git a/lib/merb-core/controller/mixins/controller.rb b/lib/merb-core/controller/mixins/controller.rb
index 8c8078c..f5cdadc 100644
--- a/lib/merb-core/controller/mixins/controller.rb
+++ b/lib/merb-core/controller/mixins/controller.rb
@@ -127,7 +127,10 @@ module Merb
     def redirect(url, opts = {})
       default_redirect_options = { :message => nil, :permanent => false }
       opts = default_redirect_options.merge(opts)
-      if opts[:message]
+      if opts[:message] || opts[:notice] || opts[:error]
+        opts[:message] ||= {}
+        opts[:message][:notice] = opts[:notice]
+        opts[:message][:error] = opts[:error]