From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 27 Aug 2011 11:03:20 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~187
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6c42a179ecec101dfdd8da4916f7970d714925fe;p=i3%2Fi3

Merge branch 'master' into next
---

6c42a179ecec101dfdd8da4916f7970d714925fe