6b4b2ba Merge branch 'master' into f13

Merged and Committed by oget 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	hydrogen.spec
    
        
file modified
+11 -1