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

[Elder Marco]

commit 0b82cd3d3968f0e476b3dee3864778e17bf7eefa
Merge: 5846437 2d165ae
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Sep 18 08:39:26 2012 -0300

    Merge branch 'master' into f16

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