[gstreamer-plugins-bad-free: 9/9] Fix merge conflicts.

[Brian Pepple]

commit 29a90da0ade41198350bee9581d92560245290d7
Merge: a933b93 1f68412
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Mar 1 11:28:07 2012 -0500

    Fix merge conflicts.

 gstreamer-plugins-bad-free.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---