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

[Elder Marco]

commit fb2bd8f03ff627fb0cf97cff331a74fdf62de3d2
Merge: 1db5f02 6fc79ba
Author: Elder Marco <eldermarco at gmail.com>
Date:   Thu Jan 3 19:19:47 2013 -0200

    Merge branch 'master' into f16

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