commit dc0cae06f38cb0b60492ea8e91e6b079816a819f Merge: 112f550 32b59a1 Author: Elder Marco <eldermarco at gmail.com> Date: Sun Sep 2 10:35:27 2012 -0300 Merge branch 'master' into el5 Conflicts: plowshare.spec plowshare.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---