From: Axel Wagner <mail@merovius.de>
Date: Wed, 10 Aug 2011 21:56:16 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.1~225
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9ccb3987adefc8cb5ec908f9bc008a925c2c7d88;p=i3%2Fi3

Merge branch 'master' into next
---

9ccb3987adefc8cb5ec908f9bc008a925c2c7d88