From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Jun 2008 20:29:59 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.0.4~42
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=17ec9800d532ef9de0e3970e1f5bf5914c939739;p=adu.git

Merge commit 'fml/master'
---

17ec9800d532ef9de0e3970e1f5bf5914c939739