From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 12 May 2012 06:24:20 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~226
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=85d6c75b947b7085cb50397bbaaf353c7aaad0b1;p=i3%2Fi3

Merge branch 'master' into next
---

85d6c75b947b7085cb50397bbaaf353c7aaad0b1