From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 28 Aug 2011 16:03:06 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~177
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e7d6cd0f1cd9da938d09088bb384e5783c292abd;p=i3%2Fi3

Merge branch 'master' into next
---

e7d6cd0f1cd9da938d09088bb384e5783c292abd