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

[Elder Marco]

commit c87eb8949214c18a22af9cf6c8e7fa9a0898fef8
Merge: 8ac1962 d052859
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Jun 9 10:14:23 2012 -0300

    Merge branch 'master' into el5

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