From: Andre Noll <maan@systemlinux.org>
Date: Sun, 12 Oct 2008 22:58:10 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.0.4~38
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e6b9f49fcde364aeff6c0d38e66694eeac0573b4;p=adu.git

Merge commit 'fml/master'
---

e6b9f49fcde364aeff6c0d38e66694eeac0573b4