Merged scripts/makefiles and other scripts with libpng-1.4.0beta57. These are mostly just cosmetic changes.