[erlang-ibrowse/f13/master: 5/5] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit 6f730a4f299746e9349e5ef442d6655b61cda517
Merge: 21fa649 1d50292
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Sep 28 13:35:12 2010 +0400

    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore
    	erlang-ibrowse.spec
    	sources

 .gitignore          |    1 +
 erlang-ibrowse.spec |   32 ++++++++++++++++++--------------
 sources             |    2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)
---