From: Matt Amos <zerebubuth@gmail.com>
Date: Thu, 1 Oct 2009 17:23:01 +0000 (+0000)
Subject: Merging 17846:17904 from trunk.
X-Git-Tag: live~6568^2~28
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/59102ea017825ceafdfe603cc43f9dd45e5c0ab6

Merging 17846:17904 from trunk.
---

59102ea017825ceafdfe603cc43f9dd45e5c0ab6