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

[Elder Marco]

commit e4f7a44d77427525f5776117fd90e633f7d025df
Merge: d197413 6fc79ba
Author: Elder Marco <eldermarco at gmail.com>
Date:   Thu Jan 3 19:18:49 2013 -0200

    Merge branch 'master' into f17

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