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

[Elder Marco]

commit 75115378abc2b49144d4c02b2bb2af87cd370dcc
Merge: f5b9339 42f5c1c
Author: Elder Marco <eldermarco at gmail.com>
Date:   Mon Jan 16 09:24:17 2012 -0200

    Merge branch 'master' into el6

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