[python-blist/el6: 9/9] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 2cf925dd6142233f74a6c599bd465876db25f1d0
Merge: 8c3616b 3d46bf7
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Sat Jul 2 20:25:26 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-blist.spec
    	sources

 .gitignore        |    2 +-
 python-blist.spec |   11 ++++++++++-
 sources           |    2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)
---