88d860 Merge Stanislav's changes on top of what I've been doing meanwhile.

Merged and Committed by Severin Gehwolf 13 years ago
    Merge Stanislav's changes on top of what I've been doing meanwhile.
    
    Conflicts (resolved):
    	avalon-framework.spec
    
        
file modified
+7 -2