commit 0991b71deaccd6175fa9e9480c1d3e085ee65b35 Merge: 255ce44 32b59a1 Author: Elder Marco <eldermarco at gmail.com> Date: Sun Sep 2 10:29:41 2012 -0300 Merge branch 'master' into f16 Conflicts: plowshare.spec plowshare.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---