From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 7 Feb 2012 22:41:36 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~89
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4fe974408da75a3aa45fcd5eabaadaa034845c1b;p=i3%2Fi3

Merge branch 'master' into next
---

4fe974408da75a3aa45fcd5eabaadaa034845c1b