[gstreamer1-plugins-bad-free/f18: 5/5] Fix merge errors

[Brian Pepple]

commit 88590be38f00d05c0aefb8a97e846def0cf9fd6b
Merge: 6eefa84 7348fb0
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Nov 21 12:24:49 2012 -0500

    Fix merge errors

 .gitignore                       |    1 +
 gstreamer1-plugins-bad-free.spec |    5 ++++-
 sources                          |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---