From: Andre Noll <maan@systemlinux.org>
Date: Thu, 16 Apr 2009 14:58:43 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.0~38^2
X-Git-Url: http://git.tuebingen.mpg.de/osl.git/tree?a=commitdiff_plain;h=b1f8454f81b73194e0e731bb1c9f520ca79ecec4;p=osl.git

Merge commit 'fml/master'
---

b1f8454f81b73194e0e731bb1c9f520ca79ecec4