From: Andre Noll <maan@systemlinux.org>
Date: Wed, 24 Dec 2008 12:14:11 +0000 (+0100)
Subject: Merge branch 'master' into bloom
X-Git-Tag: v0.1.0~14^2~9
X-Git-Url: https://git.tuebingen.mpg.de/?a=commitdiff_plain;h=7231c544e2ee3f53f5b2c8bc393b7fd1e0b8d0a7;p=adu.git

Merge branch 'master' into bloom
---

7231c544e2ee3f53f5b2c8bc393b7fd1e0b8d0a7