0a565b8 merge in the changelogs from the cherrypicks and updated sources

Authored and Committed by pwouters 11 years ago
    merge in the changelogs from the cherrypicks and updated sources
    
        
file modified
+2 -6
file modified
+0 -2