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

[Elder Marco]

commit 9756d0bb4d6b20c3262baa27100a2e2bcec6fd98
Merge: 456ab4f 2fd2d44
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:59:28 2011 -0200

    Merge branch 'master' into f16

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