From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Jun 2008 08:27:14 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.1.0~82
X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=commitdiff_plain;h=f065a93d3307f2065fcf8c95509166d15af4194c;hp=f065a93d3307f2065fcf8c95509166d15af4194c

Merge commit 'meins/master'
---