From: Andre Noll <maan@systemlinux.org>
Date: Tue, 23 Dec 2008 22:14:34 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.3~22^2~1
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=1b6ecb6d4ea35cbc9ab77dddaaa8a68b7436d019;p=dss.git

Merge commit 'fml/master'
---

1b6ecb6d4ea35cbc9ab77dddaaa8a68b7436d019