[couchdb/f14/master: 3/3] Merge branch 'master' into f14/master

[Peter Lemenkov]

commit 6afe7ba5476cda0358f00e37271c9a5df4802d31
Merge: 39836d9 0cbed4e
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Aug 17 10:18:34 2010 +0400

    Merge branch 'master' into f14/master
    
    Conflicts:
    	.gitignore
    	couchdb-0001-Force-init-script-installation.patch
    	couchdb-0002-Install-into-erllibdir-by-default.patch
    	couchdb-0003-Remove-bundled-erlang-oauth-library.patch
    	couchdb-0004-Remove-bundled-erlang-etap-library.patch
    	couchdb-0005-Remove-bundled-mochiweb-library.patch
    	couchdb-0006-Remove-bundled-ibrowse-library.patch
    	couchdb-0007-Workaround-for-system-wide-ibrowse.patch
    	couchdb-0008-Remove-pid-file-after-stop.patch
    	couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
    	couchdb-1.0.0-0001-Force-init-script-installation.patch
    	couchdb-1.0.0-0002-Install-into-erllibdir-by-default.patch
    	couchdb-1.0.0-0003-Remove-bundled-erlang-oauth-library.patch
    	couchdb-1.0.0-0004-Remove-bundled-erlang-etap-library.patch
    	couchdb-1.0.0-0005-Remove-bundled-mochiweb-library.patch
    	couchdb-1.0.0-0006-Remove-bundled-ibrowse-library.patch
    	couchdb-1.0.0-0007-Workaround-for-system-wide-ibrowse.patch
    	couchdb-1.0.0-0008-Remove-pid-file-after-stop.patch
    	couchdb-1.0.0-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
    	couchdb.spec
    	couchdb0.11.1-0001-Force-init-script-installation.patch
    	couchdb0.11.1-0002-Install-into-erllibdir-by-default.patch
    	couchdb0.11.1-0003-Remove-bundled-erlang-oauth-library.patch
    	couchdb0.11.1-0004-Remove-bundled-erlang-etap-library.patch
    	couchdb0.11.1-0005-Remove-bundled-mochiweb-library.patch
    	couchdb0.11.1-0006-Remove-bundled-ibrowse-library.patch
    	couchdb0.11.1-0007-Workaround-for-system-wide-ibrowse.patch
    	couchdb0.11.1-0008-Remove-pid-file-after-stop.patch
    	couchdb0.11.1-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
    	sources

 .gitignore                                         |    1 +
 ...uchdb-0001-Force-init-script-installation.patch |    6 +-
 ...db-0002-Install-into-erllibdir-by-default.patch |    6 +-
 ...-0003-Remove-bundled-erlang-oauth-library.patch |   80 +++++++++++++++-----
 ...b-0004-Remove-bundled-erlang-etap-library.patch |   14 ++--
 ...chdb-0005-Remove-bundled-mochiweb-library.patch |   14 ++--
 ...uchdb-0006-Remove-bundled-ibrowse-library.patch |   21 +++---
 ...b-0007-Workaround-for-system-wide-ibrowse.patch |   10 +-
 ...> couchdb-0008-Remove-pid-file-after-stop.patch |    4 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |    4 +-
 couchdb.spec                                       |   23 +++---
 sources                                            |    2 +-
 12 files changed, 115 insertions(+), 70 deletions(-)
---