Merge remote-tracking branch 'remotes/spaetz/410_OSM_attrib_v2'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 17:53:59 +0000 (11:53 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 17:53:59 +0000 (11:53 -0600)

Trivial merge