Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Fri, 29 Apr 2011 16:05:59 +0000 (17:05 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 29 Apr 2011 16:05:59 +0000 (17:05 +0100)

Trivial merge