From: Tom Hughes <tom@compton.nu>
Date: Mon, 3 Aug 2009 23:59:17 +0000 (+0000)
Subject: Merge 16817:16819 from trunk.
X-Git-Tag: live~6708^2~9
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/59eebc05b2de2c85033237c06d9474d5072b4d1f?hp=-c

Merge 16817:16819 from trunk.
---

59eebc05b2de2c85033237c06d9474d5072b4d1f