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

[Elder Marco]

commit 175596bf84d17b49552f2f38c70cf4c8cf1859ca
Merge: 970f86c 8a3a1de
Author: Elder Marco <eldermarco at gmail.com>
Date:   Mon Apr 9 20:44:18 2012 -0300

    Merge branch 'master' into el5

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