[couchdb/el5: 36/36] Merge branch 'master' into el5

[Peter Lemenkov]

commit 691b6649a1370f4905b32f1d4f0287819c9fb53a
Merge: 899ee0b db0a991
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Jul 12 14:08:49 2011 +0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	couchdb.spec
    	couchdb0.11.x-0001-Force-init-script-installation.patch
    	sources

 .gitignore                                         |    7 +-
 ...-doc-files-and-do-not-install-installatio.patch |   89 +
 ...002-Install-docs-into-versioned-directory.patch |   26 +
 ...ories-to-search-for-place-for-init-script.patch |   46 +
 ...db-0004-Install-into-erllibdir-by-default.patch |   35 +
 ...undled-etap-erlang-oauth-ibrowse-and-moch.patch |   54 +
 couchdb-0006-Fixes-for-system-wide-ibrowse.patch   |   40 +
 ...> couchdb-0007-Remove-pid-file-after-stop.patch |   10 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |   15 +-
 ... couchdb-0009-Change-respawn-timeout-to-0.patch |    6 +-
 ...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch |   39 +-
 couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch  |  466 +
 ...fix-error-when-restarting-replications-in.patch |   37 +
 couchdb-0013-Fix-for-ibrowse-2.2.0.patch           |   28 +
 couchdb-0014-Fix-for-js-1.8.5.patch                |   92 +
 couchdb-9999-Autoreconf.patch                      |17440 ++++++++++++++++++++
 couchdb.spec                                       |  169 +-
 ....11.x-0001-Force-init-script-installation.patch |   39 -
 ....x-0002-Install-into-erllibdir-by-default.patch |   34 -
 ...-0003-Remove-bundled-erlang-oauth-library.patch |  964 --
 ...x-0004-Remove-bundled-erlang-etap-library.patch | 1912 ---
 ...11.x-0005-Remove-bundled-mochiweb-library.patch | 7750 ---------
 ....11.x-0006-Remove-bundled-ibrowse-library.patch | 4088 -----
 ...x-0007-Workaround-for-system-wide-ibrowse.patch |   68 -
 ...db0.11.x-0011-Do-not-install-gzipped-docs.patch |  220 -
 sources                                            |    2 +-
 26 files changed, 18499 insertions(+), 15177 deletions(-)
---