From: Ulrich Dangel <uli@spamt.net>
Date: Wed, 4 Nov 2009 10:06:57 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v0.9.18~2
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=52eae2e4196e4e79eba9ad24c80765d4e5e120df;hp=--cc

Merge remote branch 'origin/master'
---

52eae2e4196e4e79eba9ad24c80765d4e5e120df