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

Merge branch 'master' into next
---

583fd93aefdb566dcb1d4f8bc801a53ceab9826d