[python-dirq/el5: 3/3] Merge branch 'master' into el5

[mpaladin]

commit 95adc1eef963d59cad0733887f3788bb5b9330fa
Merge: 787c3b9 3c79078
Author: Massimo <massimo.paladin at gmail.com>
Date:   Mon Feb 24 17:22:43 2014 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	python-dirq.spec

 .gitignore       |    1 +
 python-dirq.spec |   27 +++++++++++++++++++++++----
 sources          |    2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)
---