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

[Elder Marco]

commit c103578084ce0c5907d8b63b0babfc8e805121bd
Merge: 9756d0b 6284c7d
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed Nov 23 22:34:59 2011 -0200

    Merge branch 'master' into f16

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