From: Andre Noll <maan@systemlinux.org>
Date: Tue, 23 Dec 2008 16:27:06 +0000 (+0100)
Subject: Merge branch 'master' into bloom
X-Git-Tag: v0.1.0~14^2~10
X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=commitdiff_plain;h=2842e5142322dcc2e42172c28fc041dcc5673dd5;hp=2842e5142322dcc2e42172c28fc041dcc5673dd5

Merge branch 'master' into bloom
---