From: Michael Stapelberg <michael@stapelberg.de>
Date: Mon, 26 Sep 2011 19:12:07 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~134
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=db33da225842fe8c3be296b48aba6e9d1bbe0c0d;p=i3%2Fi3

Merge branch 'master' into next
---

db33da225842fe8c3be296b48aba6e9d1bbe0c0d