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

[Elder Marco]

commit 1b8778031f989ed040fb8bc683fe2323e6d173de
Merge: 262c182 eb14444
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 27 22:57:15 2012 -0200

    Merge branch 'master' into el5

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