From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 16 May 2012 04:24:53 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.3~225
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e969ed502b1d7de7a414fcd1bc1892de35edd6b2;p=i3%2Fi3

Merge branch 'master' into next
---

e969ed502b1d7de7a414fcd1bc1892de35edd6b2