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

[Elder Marco]

commit c0f03d702a457e60bfbcbdcc140be3ffe69abffa
Merge: c8bc159 32b59a1
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Sep 2 10:34:15 2012 -0300

    Merge branch 'master' into el6
    
    Conflicts:
    	plowshare.spec

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