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

[mpaladin]

commit 2271cf9b9b5841134b38eed6abbbd9f011b784ad
Merge: 1063d7e beab177
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Mon Jun 11 14:32:37 2012 +0200

    Merge branch 'master' into el5

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