454e443 Merge branch 'f15' into f17

Merged and Committed by fche 12 years ago
    Merge branch 'f15' into f17
    
    * f15:
      CVE-2012-0875 patch merged into new release, removing
    
        
file removed
-87