From: Andre Noll <maan@systemlinux.org>
Date: Fri, 30 May 2008 20:56:50 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.0.2~36
X-Git-Url: https://git.tue.mpg.de/?a=commitdiff_plain;h=dabf1553e481dbbf2847856085b58fa3c8ce1a15;p=adu.git

Merge commit 'fml/master'
---

dabf1553e481dbbf2847856085b58fa3c8ce1a15