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)
commit88105d9c643519e02082ba9cc5044bb0dfdcb7b9
tree35b3f98ac747e3a1770e9439279d212fdf1edc8f
parent18777b41ea4aa1364dbf33e86e6cb65762b53296
parentfc98b97e591acf043e1a6721d6327719dd53a53f
Merge 7744:7922 from trunk.
app/views/site/index.rhtml
public/javascripts/map.js
public/openlayers/OpenStreetMap.js