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

[Elder Marco]

commit 78a42579e614ab8ef489f74661192173b7561995
Merge: bc4623d be280e8
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Nov 4 19:08:42 2012 -0200

    Merge branch 'master' into el6

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