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

[mpaladin]

commit 7532969c67de34d1c7076d1e7377a9f9fd66cf4c
Merge: 88656df 01f7b2b
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Mon May 7 11:34:11 2012 +0200

    Merge branch 'master' into el5

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