Merge branch 'kernel-update'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 21 Jan 2011 16:04:33 +0000 (17:04 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 21 Jan 2011 16:04:33 +0000 (17:04 +0100)
Conflicts:
miscscripts/miscscripts.spec
packages/buildsys-build-rpmfusion/buildsys-build-rpmfusion-kerneldevpkgs-current


Trivial merge