From: Andre Noll <maan@systemlinux.org>
Date: Tue, 1 Jul 2008 19:26:26 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.0.4~39
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=cecbe8525740b4a899cb1a6c91064e195ae1ada2;p=adu.git

Merge commit 'fml/master'

Conflicts:

	Makefile
---

cecbe8525740b4a899cb1a6c91064e195ae1ada2