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

[Elder Marco]

commit 11d0f5548b8613eb9ad35a8c01839bb08a29fdcf
Merge: 8d60717 8f33062
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Mar 11 10:40:59 2012 -0300

    Merge branch 'master' into f15

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