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

[Elder Marco]

commit 4bc810ace91b86f9dd4854f194a5be6eb4757f82
Merge: 41a7e44 6232366
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Dec 6 21:12:55 2011 -0200

    Merge branch 'master' into el6

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