merge r17141:17256 from trunk
[rails.git] / app / views / user / index.html.erb