From: Andre Noll <maan@systemlinux.org>
Date: Sat, 10 Jan 2009 22:10:52 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.1.0~38^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=commitdiff_plain;h=0c4d0aca147b69bffe112c86cb0c6ea499f4d40a

Merge commit 'meins/master'
---

0c4d0aca147b69bffe112c86cb0c6ea499f4d40a