[couchdb/el6/master: 2/2] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit 4c52b1101930113ea8ce406d8197a858a2dee6a1
Merge: 972c005 d5ccc5f
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Aug 26 14:31:58 2010 +0400

    Merge branch 'master' into el6/master

 couchdb-0001-Force-init-script-installation.patch  |    4 +-
 ...db-0002-Install-into-erllibdir-by-default.patch |    4 +-
 ...-0003-Remove-bundled-erlang-oauth-library.patch |    4 +-
 ...b-0004-Remove-bundled-erlang-etap-library.patch |    4 +-
 couchdb-0005-Remove-bundled-mochiweb-library.patch |    4 +-
 couchdb-0006-Remove-bundled-ibrowse-library.patch  |    4 +-
 ...b-0007-Workaround-for-system-wide-ibrowse.patch |    4 +-
 couchdb-0008-Remove-pid-file-after-stop.patch      |    4 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |    4 +-
 couchdb-0010-Do-not-install-gzipped-docs.patch     |  220 +
 ...ix-respawn-timeout-to-match-default-value.patch |   24 +
 ...1.0.0-0001-Force-init-script-installation.patch |   39 -
 ....0-0002-Install-into-erllibdir-by-default.patch |   34 -
 ...-0003-Remove-bundled-erlang-oauth-library.patch |  964 ---
 ...0-0004-Remove-bundled-erlang-etap-library.patch | 1912 -----
 ....0.0-0005-Remove-bundled-mochiweb-library.patch | 7750 --------------------
 ...1.0.0-0006-Remove-bundled-ibrowse-library.patch | 4088 -----------
 ...0-0007-Workaround-for-system-wide-ibrowse.patch |   68 -
 ...hdb-1.0.0-0008-Remove-pid-file-after-stop.patch |   28 -
 ...DB-while-it-was-being-opened-would-crash-.patch |   26 -
 couchdb.spec                                       |   16 +-
 21 files changed, 270 insertions(+), 14935 deletions(-)
---