Merge 17944:17988 from trunk.
[rails.git] / app / views / layouts /
drwxr-xr-x   ..
-rw-r--r-- 7347 site.html.erb
-rw-r--r-- 27 site.rss.builder