From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Oct 2009 20:25:45 +0000 (+0000)
Subject: Merge 17944:17988 from trunk.
X-Git-Tag: live~6600^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7de5220090d01722d8ea06679493355eefd4636c?hp=7de5220090d01722d8ea06679493355eefd4636c;ds=inline

Merge 17944:17988 from trunk.
---