Merge branch 'master' of git://git.openstreetmap.org/rails
authorTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:45:48 +0000 (19:45 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 11 May 2010 18:45:48 +0000 (19:45 +0100)

Trivial merge