8aacfde Merge branch 'master' into f17

Merged and Committed by cfeist 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -4
file modified
+4 -1
file modified
+1 -1