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

[Peter Lemenkov]

commit 5c0423d3dca55b43e20b180f182e25bc8edc3f38
Merge: a3a2546 1d50292
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Sep 28 13:36:29 2010 +0400

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

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