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

[Elder Marco]

commit 6b2bc6fe53730f03488b99002842bad6cb298bfa
Merge: 7552986 e9f3c91
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Jul 7 09:48:38 2012 -0300

    Merge branch 'master' into f16

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