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

[Peter Lemenkov]

commit 08cad3582bc0da38ee3ddb7a8386331107266155
Merge: b01b482 4d060da
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Thu Jan 27 14:46:19 2011 +0300

    Merge branch 'master' into el5/master

 .gitignore          |    1 +
 erlang-ibrowse.spec |   24 +++++++++++++++++-------
 sources             |    2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)
---