d322648 Merge commit 'b445c365f682529d1883b4c0bfe52b08b72d90fb'

Merged and Committed by karsten 11 years ago
    Merge commit 'b445c365f682529d1883b4c0bfe52b08b72d90fb'
    
    Conflicts:
    	.gitignore
    	powerpc-utils-1.2.15-man.patch
    	powerpc-utils.spec
    	sources
    
        
file modified
+1 -0
powerpc-utils-1.2.15-man.patch powerpc-utils-1.2.6-man.patch
file renamed
+104 -44
file modified
+10 -11
file modified
+1 -1