43040db Merge branch 'master' into el6

Merged and Committed by toshio 13 years ago
    Merge branch 'master' into el6
    
        
file modified
+4 -2