From: Matt Amos <zerebubuth@gmail.com>
Date: Thu, 6 Aug 2009 16:24:39 +0000 (+0000)
Subject: Merging 16820:16891 from trunk.
X-Git-Tag: live~6727^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0d5be22cb517ebaaab5eb7af13150bf61e41df56?hp=--cc

Merging 16820:16891 from trunk.
---

0d5be22cb517ebaaab5eb7af13150bf61e41df56