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

[Elder Marco]

commit 75529868f46837463293b44499b8b938961ba983
Merge: c1de126 d052859
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat Jun 9 10:11:22 2012 -0300

    Merge branch 'master' into f16

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