5ddec6e Merge branch 'master' into f13

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