[lirc/f14/master: 5/5] Merge branch 'master' into f14

[Jarod Wilson]

commit 070034741b07188a7f6c072e21895233b8866072
Merge: 498e095 7ecf5db
Author: Jarod Wilson <jarod at redhat.com>
Date:   Mon Sep 6 14:02:32 2010 -0400

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

 .gitignore |    2 ++
 lirc.spec  |   22 ++++++++++++++++------
 sources    |    3 +--
 3 files changed, 19 insertions(+), 8 deletions(-)
---