adb05a9 Merge rpm-master

Authored and Committed by Alan Pevec 8 years ago
    Merge rpm-master
    
    Change-Id: Ifb9fe4cc5e9772e9cba97f5ab88e2b67264bdd15
    
        
file modified
+7 -3