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

[mpaladin]

commit 92a33c8de2bae76f6c57de0e1b0c8219bc4b2e71
Merge: 7e6e4ae beab177
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Mon Jun 11 14:32:33 2012 +0200

    Merge branch 'master' into el6

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