a65a30b Merge commit 'f3af4fe721efab781b9e5461967a0ea230c4c449' into f14

Merged and Committed by Jarod Wilson 13 years ago
    Merge commit 'f3af4fe721efab781b9e5461967a0ea230c4c449' into f14
    
    Conflicts:
    	lirc.spec
    
        
file added
+1
file modified
+12 -5