From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Jul 2009 08:03:24 +0000 (+0000)
Subject: Merge 16110:16487 from trunk.
X-Git-Tag: live~6702^2~18
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/64fb530581ffd21e2522e70e8a2d4c46d666f760

Merge 16110:16487 from trunk.
---

64fb530581ffd21e2522e70e8a2d4c46d666f760