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

[Elder Marco]

commit d9213a58db496e6576a8dd5141fadec131a67c3d
Merge: 391db75 b6bceeb
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Feb 25 11:19:15 2012 -0200

    Merge branch 'master' into f16

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