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

Merge branch 'master' into next
---

c7ac1f907747e97bc97fdb45d4cf909eebbccb90