0fce5b
Merge branch 'packaging' into users/mkubecek/master/for-next Conflicts: rpm/kernel-binary.spec.in