59423b5 Merge branch 'master' into el5

Merged and Committed by smilner 12 years ago
    Merge branch 'master' into el5
    
        
file modified
+2 -0
file modified
+12 -4
file modified
+2 -1