Merge remote-tracking branch 'smcv/ready/map'
authorJoey Hess <joey@kitenet.net>
Mon, 4 Mar 2013 22:29:58 +0000 (18:29 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Mar 2013 22:29:58 +0000 (18:29 -0400)

Trivial merge