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

[Elder Marco]

commit 3283be20619dc5317128f40337ac29082360c1f4
Merge: 463c0ef 6232366
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Dec 6 21:12:06 2011 -0200

    Merge branch 'master' into f14

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