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

[Peter Lemenkov]

commit 1c3f3a06102aaff6deca774c36f3ae07af9fe46a
Merge: b992c4a d71a93a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sat Nov 27 00:05:10 2010 +0300

    Merge branch 'master' into el6/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(-)
---