0700347
Merge branch 'master' into f14 Fix trivial merge error w/comments around disabled smp_mflags Conflicts: lirc.spec Signed-off-by: Jarod Wilson <jarod@redhat.com>