aff8679 Merge branch 'jenkins'

Merged and Committed by msrb 9 years ago
    Merge branch 'jenkins'
    
    Conflicts:
    	javapackages-tools.spec
    
        
file modified
+2 -2
file modified
+3 -2