bd58631 Merge branch 'master' into f13

Merged and Committed by scop 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file modified
+2 -2
file modified
+15 -2
file modified
+1 -1