From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 9 Aug 2011 07:27:55 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~231
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4253aa4ba20a44520f0e08f9e1df4ee9502fa565;p=i3%2Fi3

Merge branch 'master' into next
---

4253aa4ba20a44520f0e08f9e1df4ee9502fa565