Rails 3 release
merge