[couchdb/f14: 4/4] Merge branch 'f15' into f14

[Peter Lemenkov]

commit d98fb742f7e53549da2e5c452c693a352a7f126b
Merge: ab8f3e4 09d3653
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Jun 18 16:04:04 2011 +0400

    Merge branch 'f15' into f14

 ...-doc-files-and-do-not-install-installatio.patch |    2 +-
 ...002-Install-docs-into-versioned-directory.patch |    2 +-
 ...ories-to-search-for-place-for-init-script.patch |    2 +-
 ...db-0004-Install-into-erllibdir-by-default.patch |    2 +-
 ...undled-etap-erlang-oauth-ibrowse-and-moch.patch |    2 +-
 couchdb-0006-Fixes-for-system-wide-ibrowse.patch   |    2 +-
 couchdb-0007-Remove-pid-file-after-stop.patch      |    2 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |    2 +-
 couchdb-0009-Change-respawn-timeout-to-0.patch     |    2 +-
 ...0-Relax-curl-dependency-to-7.15-for-RHEL5.patch |    2 +-
 couchdb-0011-Added-Spidermonkey-1.8.5-patch.patch  |    2 +-
 ...fix-error-when-restarting-replications-in.patch |    2 +-
 couchdb-0013-Fix-for-ibrowse-2.2.0.patch           |   28 ++++++
 couchdb-0014-Fix-for-js-1.8.5.patch                |   92 ++++++++++++++++++++
 couchdb.spec                                       |   62 +++++++++----
 15 files changed, 175 insertions(+), 31 deletions(-)
---