From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 17 Aug 2011 10:17:29 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~219
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7eacf8dd049dd2e92ae4e5e92f12f148290e81fa;hp=-c;p=i3%2Fi3

Merge branch 'master' into next
---

7eacf8dd049dd2e92ae4e5e92f12f148290e81fa