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

[Elder Marco]

commit f5b933967b3daa7e85f97dacb333e20235fd8f54
Merge: 4bc810a 3355b88
Author: Elder Marco <eldermarco at gmail.com>
Date:   Fri Dec 30 16:24:33 2011 -0200

    Merge branch 'master' into el6

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