From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 31 Aug 2011 12:45:14 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~171
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b4809e9ba727c6113f325b49e378b2a3560ccfed;p=i3%2Fi3

Merge branch 'master' into next
---

b4809e9ba727c6113f325b49e378b2a3560ccfed