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

[Elder Marco]

commit 1ef64593b0412ce37a276d44dfddeb5f2123a7e6
Merge: fbbce1d 2d165ae
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Sep 18 08:41:20 2012 -0300

    Merge branch 'master' into el5

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