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

[Elder Marco]

commit 2b5b8e2b505cacdeeb615c7248c7ceb680556eb6
Merge: c87eb89 e9f3c91
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Jul 7 09:50:23 2012 -0300

    Merge branch 'master' into el5

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