938e19
Merge remote-tracking branch 'origin/master' into f22 Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com> Conflicts: acpid.spec