PEAR 0.9.4 - bzip2 support
resolved conflicts