From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 00:02:50 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~194
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6d91a6248e65e07848785ae74846c6fb0db8c4c2;p=i3%2Fi3

Merge branch 'master' into next
---

6d91a6248e65e07848785ae74846c6fb0db8c4c2