8dd4db6 Merge remote-tracking branch 'origin/master' into f16

Merged and Committed by Adam Tkac 12 years ago
    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	quagga.spec
    	sources
    
        
file removed
-304
file removed
-152
file modified
+75 -45
file modified
+1 -1