From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Fri, 21 Jan 2011 16:04:33 +0000 (+0100)
Subject: Merge branch 'kernel-update'
X-Git-Tag: v2.6~89
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=cd7bdcf43b916179514631bdcdd9551df5d166bd;p=libi2ncommon

Merge branch 'kernel-update'

Conflicts:
	miscscripts/miscscripts.spec
	packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current
---

cd7bdcf43b916179514631bdcdd9551df5d166bd