a2733f0 Merge branch 'el6'

Merged and Committed by msuchy 12 years ago
    Merge branch 'el6'
    
    Conflicts:
    	java-service-wrapper.spec
    
        
file modified
+5 -0