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

[Peter Lemenkov]

commit 972c00518e1b8d711f287058480336937f2fb6cf
Merge: 30346ce 0cbed4e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Aug 17 10:34:56 2010 +0400

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

 .gitignore                                         |    1 +
 couchdb-0001-Force-init-script-installation.patch  |   39 +
 ...db-0002-Install-into-erllibdir-by-default.patch |   34 +
 ...-0003-Remove-bundled-erlang-oauth-library.patch | 1004 +++
 ...b-0004-Remove-bundled-erlang-etap-library.patch | 1912 +++++
 couchdb-0005-Remove-bundled-mochiweb-library.patch | 7750 ++++++++++++++++++++
 couchdb-0006-Remove-bundled-ibrowse-library.patch  | 4089 +++++++++++
 ...b-0007-Workaround-for-system-wide-ibrowse.patch |   68 +
 couchdb-0008-Remove-pid-file-after-stop.patch      |   28 +
 ...DB-while-it-was-being-opened-would-crash-.patch |   26 +
 couchdb.spec                                       |   23 +-
 sources                                            |    2 +-
 12 files changed, 14965 insertions(+), 11 deletions(-)
---