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

[mpaladin]

commit 7e6e4ae4125c28042cdf965bc464fcee286b6344
Merge: 9e5cac4 6b7d55d
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Wed May 9 22:20:18 2012 +0200

    Merge branch 'master' into el6

 python-dirq.spec |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)
---