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

[Elder Marco]

commit 970f86c9a18bb044682a4d3fe30e41699a9a5208
Merge: 05d834b 8f33062
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Mar 11 10:42:44 2012 -0300

    Merge branch 'master' into el5

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