From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 28 Mar 2011 17:24:06 +0000 (+0200)
Subject: Merge branch 'master' into stable
X-Git-Tag: v3.4.15~1^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ade0b7669be72b77c56d85dcc78761d05815d347;p=genkernel.git

Merge branch 'master' into stable
---

ade0b7669be72b77c56d85dcc78761d05815d347