From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Jun 2009 16:45:26 +0000 (+0000)
Subject: Merge 16070:16110 from trunk.
X-Git-Tag: live~7327^2~20
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e657cff464b6db8384b56236ad9491223a22b1e2

Merge 16070:16110 from trunk.
---

e657cff464b6db8384b56236ad9491223a22b1e2