4b032de Merge squash rpm-master

Authored and Committed by Alan Pevec 8 years ago
    Merge squash rpm-master
    
    Change-Id: I56275e91727ced6cdbf9c9bdd1e023cb49b7feda
    
        
file modified
+5 -1