[erlang-mochiweb/el5/master: 8/8] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit 1f7dc1a796b0848f05f1e6df44b76bd966a77698
Merge: 64badbb afc3a01
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Aug 11 21:47:57 2010 +0400

    Merge branch 'master' into el5/master
    
    Conflicts:
    	erlang-mochiweb.spec
    	sources

 ...The-term-boolean-isn-t-availabie-in-R12B5.patch |   26 +++++
 ...002-No-erlang-min-A-B-in-R12B-5-and-below.patch |   29 ++++++
 ...-such-function-erl_scan-string-3-in-R12B5.patch |   26 +++++
 ...ction-lists-keyfind-3-in-R12B5-use-lists-.patch |   85 +++++++++++++++++
 ...elated-tests-on-R12B-requires-ssl-example.patch |   98 ++++++++++++++++++++
 erlang-mochiweb.spec                               |   51 +++++-----
 sources                                            |    2 +-
 7 files changed, 291 insertions(+), 26 deletions(-)
---