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

[mpaladin]

commit b05b3272df896b92ec65f5a15301159c4c1e6e09
Merge: 7532969 c7d1a78
Author: mpaladin <massimo.paladin at gmail.com>
Date:   Tue May 8 16:12:25 2012 +0200

    Merge branch 'master' into el5

 python-dirq.spec |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)
---