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

[Elder Marco]

commit ef575606daad5cf11bb67eb67c6ab962f1ef95b8
Merge: c103578 6232366
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Dec 6 21:10:00 2011 -0200

    Merge branch 'master' into f16

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