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

[Peter Lemenkov]

commit cedd2f517db51c7c1132fc8b2349c0b6879869f1
Merge: 357ea29 7112d53
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Sep 30 12:11:44 2010 +0400

    Merge branch 'master' into el5/master

 .gitignore                                         |    1 +
 ...The-term-boolean-isn-t-availabie-in-R12B5.patch |    6 ++--
 ...002-No-erlang-min-A-B-in-R12B-5-and-below.patch |    6 ++--
 ...-such-function-erl_scan-string-3-in-R12B5.patch |    8 +++---
 ...ction-lists-keyfind-3-in-R12B5-use-lists-.patch |    8 +++---
 ...elated-tests-on-R12B-requires-ssl-example.patch |    6 ++--
 ...r-conversion-from-int-to-string-should-be.patch |   26 --------------------
 erlang-mochiweb.spec                               |   20 ++++++++++-----
 sources                                            |    2 +-
 9 files changed, 32 insertions(+), 51 deletions(-)
---