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

[Elder Marco]

commit 091b2ffe6291ba5f5dc35a3037faa31e12edeacf
Merge: 9b0000d 2fd2d44
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 21:00:08 2011 -0200

    Merge branch 'master' into f14

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