commit: be040f3cab1457638b9c7aa48e2716be66832e28 Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com> AuthorDate: Sun Jun 29 21:24:53 2014 +0000 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Sun Jun 29 21:24:53 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=be040f3c
fixed merged conflicts
