From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 11 Sep 2011 21:52:44 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~164
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=717ae819c55d2aca9f4bf2e1198e035ca64114ac;p=i3%2Fi3

Merge branch 'master' into next
---

717ae819c55d2aca9f4bf2e1198e035ca64114ac