[python-dirq/el6: 10/10] Merge branch 'master' into el6

[mpaladin]

commit 69e06b387dc5228614bcff4cf785ceb80a421a19
Merge: b550c7e b494a0e
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Tue Mar 20 20:42:15 2012 +0100

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

 .gitignore                |    2 ++
 dirq-1.0.1-dist-tag.patch |    9 +++++++++
 python-dirq.spec          |   33 ++++++++++++++++++++++++++-------
 sources                   |    2 +-
 4 files changed, 38 insertions(+), 8 deletions(-)
---