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

[Elder Marco]

commit e2a32b231991e9d3d6c472acd14ca09977bf8ffe
Merge: 0b82cd3 be280e8
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Nov 4 19:08:03 2012 -0200

    Merge branch 'master' into f16

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