Rails 3.1 compatiblity#1

thedarkone wants to merge 5 commits intojcnetdev:masterjcnetdev/acts_as_state_machine:masterfrom

thedarkone:rails-3-1thedarkone/acts_as_state_machine:rails-3-1Copy head branch name to clipboard