761a8b0 Merge branch 'master' into el5

Merged and Committed by toshio 12 years ago
    Merge branch 'master' into el5
    
        
file modified
+23 -7