Merge commit 'smcv/img-bugfix'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 16 Jun 2009 19:07:58 +0000 (15:07 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 16 Jun 2009 19:07:58 +0000 (15:07 -0400)

Trivial merge