c7490e2 Merge remote-tracking branch 'origin/el5/master'

Merged and Committed by ellert 13 years ago
    Merge remote-tracking branch 'origin/el5/master'
    
        
file added
+24
file modified
+6 -0