9fc6826 Merge changes from devel:

Authored and Committed by mbooth 14 years ago
    Merge changes from devel:
    - Not ready yet for OSGi depsolving. See RHBZ #488352.
    - BR java-devel 1.6.0.
    - Remove all jmx/mx4j hacks. It is simply not needed - jmx is in the jdk
        since Java 5.
    
        
file modified
+11 -24
file modified
+0 -7