From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Jul 2009 23:47:40 +0000 (+0000)
Subject: Merge 16216:16355 from trunk.
X-Git-Tag: live~7841^2~4
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/9a32033209545a69d60cbd551e6bd975cda64341?hp=--cc

Merge 16216:16355 from trunk.
---

9a32033209545a69d60cbd551e6bd975cda64341