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

[Elder Marco]

commit 5846437085f67facc62c9133637acb5b00e2a9a8
Merge: 0991b71 5c72eb9
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Sep 2 10:46:30 2012 -0300

    Merge branch 'master' into f16

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