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

[mpaladin]

commit 4f8f72fc304949d2691cd87f7cadc8a94cb2dd08
Merge: 92a33c8 02ad7fe
Author: Massimo <massimo.paladin at gmail.com>
Date:   Wed May 29 10:14:36 2013 +0200

    Merge branch 'master' into el6

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