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

[Elder Marco]

commit 37e0bc727a608e0398f9cbc2f922fa8251889f16
Merge: b00b757 2d165ae
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Sep 18 08:37:54 2012 -0300

    Merge branch 'master' into f17

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