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

[Elder Marco]

commit 297573bdde424ec0c8675637bcf5754b74ec7a0d
Merge: c712405 2fd2d44
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:58:26 2011 -0200

    Merge branch 'master' into el5

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