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

[Elder Marco]

commit fd8520bfc157b6be85d828253ab132c9468238d3
Merge: f706b85 e9f3c91
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Jul 7 09:49:35 2012 -0300

    Merge branch 'master' into el6

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