[couchdb/el5/master: 18/18] Merge branch 'f13/master' into el5/master

[Peter Lemenkov]

commit 899ee0bd0ba53df6e99cf8f8e688984c4a7214a1
Merge: 579fdb8 25bdd8e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 26 15:03:54 2010 +0400

    Merge branch 'f13/master' into el5/master
    
    Conflicts:
    	.gitignore
    	couchdb.spec
    	sources

 .gitignore                                         |    1 +
 ...db-0002-Install-into-erllibdir-by-default.patch |   92 --
 couchdb-0007-Fix-for-system-wide-mochiweb.patch    |   60 --
 ...b-0009-Workaround-for-system-wide-ibrowse.patch |   31 -
 couchdb.spec                                       |   73 +-
 ....11.x-0001-Force-init-script-installation.patch |   10 +-
 ....x-0002-Install-into-erllibdir-by-default.patch |   34 +
 ...-0003-Remove-bundled-erlang-oauth-library.patch |  107 +--
 ...x-0004-Remove-bundled-erlang-etap-library.patch |   49 +-
 ...11.x-0005-Remove-bundled-mochiweb-library.patch | 1027 +++++++++++++++-----
 ....11.x-0006-Remove-bundled-ibrowse-library.patch |  129 +--
 ...x-0007-Workaround-for-system-wide-ibrowse.patch |   68 ++
 ...hdb0.11.x-0008-Remove-pid-file-after-stop.patch |   10 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |   28 +
 ...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch |  100 ++
 ...db0.11.x-0011-Do-not-install-gzipped-docs.patch |  220 +++++
 ...ix-respawn-timeout-to-match-default-value.patch |   24 +
 sources                                            |    2 +-
 18 files changed, 1431 insertions(+), 634 deletions(-)
---