From: Andre Noll <maan@systemlinux.org>
Date: Sat, 18 Oct 2008 18:50:06 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.0.4~37
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=4c71ff7f9b6afe7c15331a1cc9e134c2db65cd73;p=adu.git

Merge commit 'fml/master'
---

4c71ff7f9b6afe7c15331a1cc9e134c2db65cd73