Merge remote-tracking branch 'anarcat/osm_arbitrary_layers'
authorJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:10:03 +0000 (10:10 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 25 Aug 2012 14:10:03 +0000 (10:10 -0400)

Trivial merge