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

[mpaladin]

commit 1752783370ae40e7aa96f1c751cf910f5ebd5fbc
Merge: 69e06b3 e8814f6
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Fri Mar 30 11:05:52 2012 +0200

    Merge branch 'master' into el6

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