From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Feb 2009 18:27:20 +0000 (+0100)
Subject: Merge commit 'stark/master'
X-Git-Tag: v0.1.0~38^2^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=commitdiff_plain;h=62d0e2422234f6e47f2f9202f0e31a1db184580a

Merge commit 'stark/master'
---

62d0e2422234f6e47f2f9202f0e31a1db184580a