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

Merge branch 'master' into next
---

c3d0957efd46eaf86e711215f1ca8743157ab2da