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

[Elder Marco]

commit 8413d1118b3d78706de4af566c754ea46e264467
Merge: 6cb874a 8a3a1de
Author: Elder Marco <eldermarco at gmail.com>
Date:   Mon Apr 9 20:42:03 2012 -0300

    Merge branch 'master' into f16

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