284eb49 Merge branch 'master' into el5

Merged and Committed by topdog 11 years ago
    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    
        
file added
+13
file added
+25
file modified
+66 -17
file modified
+1 -1