From: Andre Noll <maan@systemlinux.org>
Date: Sun, 19 Apr 2009 21:20:51 +0000 (+0200)
Subject: Merge commit 'athcx/master'
X-Git-Tag: v0.1.0~38
X-Git-Url: http://git.tuebingen.mpg.de/osl.git/tree?a=commitdiff_plain;h=e2359e0a52bcb16ff760c114b089b96049b368c8;p=osl.git

Merge commit 'athcx/master'
---

e2359e0a52bcb16ff760c114b089b96049b368c8