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

[Elder Marco]

commit f6c41d29bfef7b35b7e593e9bcaaf2f159661b57
Merge: 876647c 6232366
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Dec 6 21:11:20 2011 -0200

    Merge branch 'master' into f15

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