From: Tom Hughes <tom@compton.nu>
Date: Mon, 13 Jul 2009 23:28:02 +0000 (+0000)
Subject: Merge 16355:16480 from trunk.
X-Git-Tag: live~7599^2
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/942ca1ff2332252ee8db34a436c0b0c1983145b1

Merge 16355:16480 from trunk.
---

942ca1ff2332252ee8db34a436c0b0c1983145b1