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

[Elder Marco]

commit 3c8dd0bc56f558320d1c6b47a09040cd43f945ee
Merge: 21b90d9 32b59a1
Author: Elder Marco <eldermarco at gmail.com>
Date:   Sun Sep 2 10:28:09 2012 -0300

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

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