[plowshare/f16: 3/3] Merge branch 'master' into f16

[Elder Marco]

commit 961f43334f6f7ef7e9031a5ca3b9bd80ebc9c2f3
Merge: 9bd1028 42f5c1c
Author: Elder Marco <eldermarco at gmail.com>
Date:   Mon Jan 16 09:15:34 2012 -0200

    Merge branch 'master' into f16

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