[plowshare/el5: 2/2] Merge branch 'master' into el5

[Elder Marco]

commit 73d9054a0b73db76573d43248bb7a151db1cb263
Merge: 7040928 e34ca56
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed May 22 19:08:14 2013 -0300

    Merge branch 'master' into el5

 .gitignore     |    1 +
 plowshare.spec |   14 +++++++++-----
 sources        |    2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)
---