[erlang-mochiweb/el6/master: 2/2] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit cd49bdf449f8cec286d0e2f0907a2e2bea81487f
Merge: 800d7c0 4417ccf
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Nov 13 12:45:25 2010 +0300

    Merge branch 'master' into el6/master

 .gitignore                                         |    1 +
 ...The-term-boolean-isn-t-availabie-in-R12B5.patch |    4 ++--
 ...002-No-erlang-min-A-B-in-R12B-5-and-below.patch |    4 ++--
 ...-such-function-erl_scan-string-3-in-R12B5.patch |    6 +++---
 ...ction-lists-keyfind-3-in-R12B5-use-lists-.patch |    8 ++++----
 ...elated-tests-on-R12B-requires-ssl-example.patch |    4 ++--
 erlang-mochiweb.spec                               |   14 ++++++++++----
 sources                                            |    2 +-
 8 files changed, 25 insertions(+), 18 deletions(-)
---