Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Sun, 9 May 2010 16:16:32 +0000 (17:16 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 9 May 2010 16:16:32 +0000 (17:16 +0100)

Trivial merge