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

[Peter Lemenkov]

commit d2c29b7481273e7eeefa4b03b76078f0e76d128f
Merge: 6ad6f30 d71a93a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Nov 27 00:08:28 2010 +0300

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

 .gitignore                                         |    2 +
 ...1-Use-http-instead-of-httpc-in-old-Erlang.patch |   40 +++++++++++++
 erlang-oauth.spec                                  |   59 +++++++++++--------
 sources                                            |    2 +-
 4 files changed, 77 insertions(+), 26 deletions(-)
---