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

[Elder Marco]

commit 37d28f2f20015285b5d1ec79bbaabe414c71bd21
Merge: f6c41d2 3355b88
Author: Elder Marco <eldermarco at gmail.com>
Date:   Fri Dec 30 16:23:52 2011 -0200

    Merge branch 'master' into f15

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