From: Sebastian Pipping <sebastian@pipping.org>
Date: Tue, 8 Feb 2011 17:01:11 +0000 (+0100)
Subject: Merge branch 'bug-314575' using --no-ff
X-Git-Tag: v3.4.13~1^2~1
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8097ea8d4c74ff47be2e07efe1b3a45d8871f834;p=genkernel.git

Merge branch 'bug-314575' using --no-ff
---

8097ea8d4c74ff47be2e07efe1b3a45d8871f834