5980c2 - merge review fixes (#226220)

Authored and Committed by tmraz 11 years ago
    - merge review fixes (#226220)
    - adjust the SHLIB_VERSION_NUMBER to reflect library name (#429846)
    
        
file modified
+18 -6