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

[Elder Marco]

commit 41a7e44687d88627a3a8ffd9f7c11bb40009c066
Merge: 0eadeec 6284c7d
Author: Elder Marco <eldermarco at gmail.com>
Date:   Wed Nov 23 22:38:27 2011 -0200

    Merge branch 'master' into el6

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