From: Robert Kaiser <robert@notebook.(none)>
Date: Sun, 31 Jan 2010 20:04:52 +0000 (+0100)
Subject: merge master
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=84ddfc7d195a3629fac65e17c3a11baeaef7df6b;p=themes.git

merge master
---

84ddfc7d195a3629fac65e17c3a11baeaef7df6b