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

[Elder Marco]

commit 66b8957a5f898498239a444598f9bbf02b210f84
Merge: b43e6b3 3a5dadc
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sat May 12 10:03:29 2012 -0300

    Merge branch 'master' into f15

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