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

[Elder Marco]

commit 0eadeec4cafc163ba13adf91712b15f39f2f2283
Merge: 2fecd27 2fd2d44
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:56:58 2011 -0200

    Merge branch 'master' into el6

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