From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 7 Aug 2011 18:45:20 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~232
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e3049028744c66c23e4db964e5ad7d0f08c86bb7;p=i3%2Fi3

Merge branch 'master' into next
---

e3049028744c66c23e4db964e5ad7d0f08c86bb7