Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...
[rails.git] / public / openlayers /
drwxr-xr-x   ..
-rw-r--r-- 469535 OpenLayers.js
-rw-r--r-- 6421 OpenStreetMap.js
drwxr-xr-x - img
drwxr-xr-x - theme