Merge commit 'remotes/smcv/ready/harishcm-map-fix' into staging
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:23:06 +0000 (10:23 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:23:06 +0000 (10:23 +0200)

Trivial merge