From: Sebastian Pipping <sebastian@pipping.org>
Date: Sun, 12 Aug 2012 21:39:49 +0000 (+0200)
Subject: Merge branch 'genkernel-conf-2'
X-Git-Tag: v3.4.41~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa6374eb01639b1f25e5de04b48e1889603285ea;p=genkernel.git

Merge branch 'genkernel-conf-2'
---

fa6374eb01639b1f25e5de04b48e1889603285ea