From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 16 Jun 2009 19:07:58 +0000 (-0400)
Subject: Merge commit 'smcv/img-bugfix'
X-Git-Tag: 3.1415~37
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b9ba68208ebdb250dc4d4f8866cb834f5bd8764c

Merge commit 'smcv/img-bugfix'
---

b9ba68208ebdb250dc4d4f8866cb834f5bd8764c