From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 22 Sep 2011 22:11:14 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=daebe28b093bdf1f033041edabe9a80da1cc077a;hp=-c;p=i3%2Fi3

Merge branch 'master' into next
---

daebe28b093bdf1f033041edabe9a80da1cc077a