0aa9d31 Merge branch 'master' into el5

Merged and Committed by toshio 12 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -3
file modified
+5 -1
file modified
+1 -1