97d6204 add .gitignore

Merged and Committed by nbecker 13 years ago
    add .gitignore
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file modified
+10 -4
file modified
+1 -1