From: Michael Prokop <devnull@localhost>
Date: Mon, 26 Nov 2007 18:55:44 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.0.11~16
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=2124a2fe0748887da88662abc5ce7c2c643120b8

Merge branches
---

2124a2fe0748887da88662abc5ce7c2c643120b8