Merge branch 'master' into openstreetbugs

author Tom Hughes <tom@compton.nu>

Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)

committer Tom Hughes <tom@compton.nu>

Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
author Tom Hughes <tom@compton.nu>
Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
committer Tom Hughes <tom@compton.nu>
Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
diff --cc config/environment.rb
Simple merge
diff --cc lib/osm.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
committer	Tom Hughes <tom@compton.nu>
	Fri, 14 May 2010 21:50:38 +0000 (22:50 +0100)
		1	2
config/environment.rb	patch \|	diff1 \|	diff2 \|	blob \| history
lib/osm.rb	patch \|	diff1 \|	diff2 \|	blob \| history