From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 29 Nov 2011 22:37:11 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~207
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0f9fbcbd259a26969c3503ac1e31b2cf2df351f5;p=i3%2Fi3

Merge branch 'master' into next
---

0f9fbcbd259a26969c3503ac1e31b2cf2df351f5