--- /opt/local/lib/ruby/gems/1.8/gems/actionpack-2.3.2/lib/action_controller/session/cookie_store.rb	2009-03-23 22:06:55.000000000 -0700
+++ ./vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb	2009-05-07 18:46:30.000000000 -0700
@@ -148,12 +148,12 @@

         # Marshal a session hash into safe cookie data. Include an integrity hash.
         def marshal(session)
-          @verifier.generate(persistent_session_id!(session))
+          @verifier.generate(persistent_session_id!(session).sort{ |a, b| a[0].to_s <=> b[0].to_s })
         end

         # Unmarshal cookie data to a hash and verify its integrity.
         def unmarshal(cookie)
-          persistent_session_id!(@verifier.verify(cookie)) if cookie
+          persistent_session_id!(Hash[*@verifier.verify(cookie).flatten]) if cookie
         rescue ActiveSupport::MessageVerifier::InvalidSignature
           nil
         end