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

[Elder Marco]

commit 6cb874aeba5d0de50fd2ec1dda8d35b12c2f6ef9
Merge: d9213a5 8f33062
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Mar 11 10:40:26 2012 -0300

    Merge branch 'master' into f16

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