From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 May 2008 23:22:26 +0000 (+0000)
Subject: Merge 7452:7744 from trunk.
X-Git-Tag: live~7747^2~11
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5620d7263a36fe842f4d97bc21dda5edd0651b37

Merge 7452:7744 from trunk.
---

5620d7263a36fe842f4d97bc21dda5edd0651b37