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

[Elder Marco]

commit e246c1fe59e4ab9f8f2daab18ca15b66f3f41776
Merge: 1b87780 6fc79ba
Author: Elder Marco <eldermarco at gmail.com>
Date:   Thu Jan 3 19:21:18 2013 -0200

    Merge branch 'master' into el5

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