Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 20 Apr 2011 18:24:54 +0000 (19:24 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 20 Apr 2011 18:24:54 +0000 (19:24 +0100)

Trivial merge