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

[Elder Marco]

commit 9bd10281136d7ecbef7c06cdb83d68b14d19b183
Merge: ef57560 3355b88
Author: Elder Marco <eldermarco at gmail.com>
Date:   Fri Dec 30 16:22:51 2011 -0200

    Merge branch 'master' into f16

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