From: Andre Noll <maan@systemlinux.org>
Date: Tue, 20 May 2008 09:24:54 +0000 (+0200)
Subject: Merge commit 'stark/master'
X-Git-Tag: v0.0.2~45
X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=commitdiff_plain;h=df32293ac0a021f4d46c924e842c2d89a2463ae6

Merge commit 'stark/master'
---

df32293ac0a021f4d46c924e842c2d89a2463ae6