9387c34 Merge branch 'master' into f12

Merged and Committed by Tim Niemueller 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
file modified
+6 -3
file modified
+1 -1