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

[Peter Lemenkov]

commit 800d7c0db3c55caa2d1e80773d83186e14b36369
Merge: 882364a 9461867
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Oct 13 13:14:39 2010 +0400

    Merge branch 'master' into el6/master

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