- merge DEVEL branch (update to 4.2.1).

- merge DEVEL branch (update to 4.2.1).

Changed files:
    php-apache.ini -> 1.2
    php-cgi.ini -> 1.2
    php-cpdf-fix.patch -> 1.2
    php-fastcgi.patch -> 1.3
    php-hyperwave-fix.patch -> 1.2
    php-java-fix.patch -> 1.2
    php-link-libs.patch -> 1.5
    php-mcal-shared-lib.patch -> 1.2
    php-module-install -> 1.6
    php-msession-shared-lib.patch -> 1.2
    php-mysql-socket.patch -> 1.6
    php-no_php_pcre_in_SAPI_c.patch -> 1.3
    php-openssl-for-ext-only.patch -> 1.2
    php-pldlogo.patch -> 1.26
    php-sapi-ini-file.patch -> 1.2
    php-session-fix-shared.patch -> 1.2
    php-shared.patch -> 1.5
    php-wddx-fix.patch -> 1.2
    php-xmlrpc-includes.patch -> 1.2
    php4-apache.ini -> 1.2
    php4-cgi.ini -> 1.2
    php4-cpdf-fix.patch -> 1.2
    php4-hyperwave-fix.patch -> 1.2
    php4-link-libs.patch -> 1.5
    php4-mcal-shared-lib.patch -> 1.2
    php4-module-install -> 1.6
    php4-msession-shared-lib.patch -> 1.2
    php4-pldlogo.patch -> 1.26
    php4-sapi-ini-file.patch -> 1.2
    php4-shared.patch -> 1.5
    php4-wddx-fix.patch -> 1.2