Merge 7744:7922 from trunk.
authorTom Hughes <tom@compton.nu>
Wed, 28 May 2008 16:37:31 +0000 (16:37 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 28 May 2008 16:37:31 +0000 (16:37 +0000)
1  2 
app/views/site/index.rhtml
public/javascripts/map.js
public/openlayers/OpenStreetMap.js

Simple merge
Simple merge
Simple merge