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

[Elder Marco]

commit bc4623d9fae54453cc622e202f3bb76c62747533
Merge: 91fb135 2d165ae
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Sep 18 08:40:21 2012 -0300

    Merge branch 'master' into el6

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