rails 3.1 support#2

vincenzodev wants to merge 3 commits intoopenteam:masteropenteam/has_enum:masterfrom

vincenzodev:mastervincenzodev/has_enum:masterCopy head branch name to clipboard