final merge down from 1.1.2 maintenance branch (cvs up -j FLAC_RELEASE_1_1_2_MAINTENANCE_BASELINE -j FLAC_RELEASE_1_1_2_MAINTENANCE_BRANCH)