131ddd1 Merge branch 'master' into el6

Merged and Committed by lfarkas 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	rxtx.spec
    
        
file added
+12
file modified
+18 -3