f786ea5 Merge remote branch 'origin/f14/master' into f13/master

Merged and Committed by tagoh 13 years ago
    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore
    	man-pages-ja.spec
    	sources
    
        
file modified
+1 -0
file added
+143
file modified
+4 -4
file modified
+35 -3
file modified
+1 -1