Merge branch 'packaging'
authorMichal Marek <mmarek@suse.cz>
Thu, 30 Jan 2014 17:19:11 +0000 (18:19 +0100)
committerMichal Marek <mmarek@suse.cz>
Thu, 30 Jan 2014 17:19:11 +0000 (18:19 +0100)
commit5300aad0a1df9665dff3530569ff2e6d095daa88
treeae236555c780b544a4f9154ab05ccd612302485b
parentc50c79ffb4ecae9767f37abff4f75f675e77cefe
Merge branch 'packaging'

Conflicts:
rpm/kernel-source.spec.in

suse-commit: d5b8d5c23bea2b29bb02c1cfa8e8477a867dae62