From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 11:01:41 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~249
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=746472e5e44db7f346a08c9906693a2cb4be1ac3;p=i3%2Fi3

Merge branch 'master' into next
---

746472e5e44db7f346a08c9906693a2cb4be1ac3