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

[Elder Marco]

commit bb5a9239f710458a54d2777852beb3505fa28285
Merge: be72556 2fd2d44
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:59:51 2011 -0200

    Merge branch 'master' into f15

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