From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Oct 2009 20:16:03 +0000 (+0000)
Subject: Merge 17067 from trunk.
X-Git-Tag: live~6542^2~6
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/20a861392e1ee7970da5d95b546aa8551faaf27b?hp=20a861392e1ee7970da5d95b546aa8551faaf27b

Merge 17067 from trunk.
---