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

[Elder Marco]

commit 98c11178c18b91c2a2a0118091ba48addc337e2b
Merge: e94a87e 6fc79ba
Author: Elder Marco <eldermarco at gmail.com>
Date:   Thu Jan 3 19:20:29 2013 -0200

    Merge branch 'master' into el6

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