From: Michael Prokop <mika@grml.org>
Date: Thu, 18 Aug 2011 16:58:11 +0000 (+0200)
Subject: Merge branch 'mika/0.9.34'
X-Git-Tag: v0.9.35~12
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=372cd7a591f40f0170d1f1486bf671531397f699

Merge branch 'mika/0.9.34'
---

372cd7a591f40f0170d1f1486bf671531397f699