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

[Elder Marco]

commit caa6916fffb7ac8ce5f596bd35536d12e38d09f7
Merge: 37d28f2 42f5c1c
Author: Elder Marco <eldermarco at gmail.com>
Date:   Mon Jan 16 09:23:29 2012 -0200

    Merge branch 'master' into f15

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