Rails3 #2

Open
wants to merge 8 commits into
from