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

[Elder Marco]

commit f706b8531a63c6579ebc7bfb006c0778e94e190c
Merge: 6b70066 d052859
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Jun 9 10:13:06 2012 -0300

    Merge branch 'master' into el6

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