Merging the man-pages and CHANGES from 1.1