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

[Elder Marco]

commit 5222a1435882726ecd6fabcc90ee4151d76f2610
Merge: 7ecfd7a e34ca56
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed May 22 19:07:42 2013 -0300

    Merge branch 'master' into el6

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