From: Matt Amos <zerebubuth@gmail.com>
Date: Tue, 29 Sep 2009 10:23:31 +0000 (+0000)
Subject: Merging 17824:17845 from trunk to blocking branch.
X-Git-Tag: live~6617^2~33
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4

Merging 17824:17845 from trunk to blocking branch.
---

09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4