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

[Elder Marco]

commit 463c0efffd6980fe7c45c36d63aea7599ba20eea
Merge: 091b2ff 6284c7d
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed Nov 23 22:37:38 2011 -0200

    Merge branch 'master' into f14

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