From: Matt Amos <zerebubuth@gmail.com>
Date: Tue, 25 Aug 2009 16:49:52 +0000 (+0000)
Subject: merge r17141:17256 from trunk
X-Git-Tag: live~6664^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c6bf21a9d054f29d788272767b7a77d58fe56aec

merge r17141:17256 from trunk
---

c6bf21a9d054f29d788272767b7a77d58fe56aec