f791ae3 Merge branch 'master' into f13

Merged and Committed by toshio 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    
        
file modified
+9 -3
file modified
+1 -1