From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Jun 2008 14:46:50 +0000 (+0200)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.0~49
X-Git-Url: http://git.tuebingen.mpg.de/osl.git/tree?a=commitdiff_plain;h=f0af855a393748664497a5503d0011e09daeffbc;p=osl.git

Merge commit 'fml/master'
---

f0af855a393748664497a5503d0011e09daeffbc