[gstreamer1-plugins-bad-free/f18: 6/6] fix merge

[Peter Robinson]

commit b3e70079a598bd03de950108bc73bf98f1405868
Merge: 1c6a3bc 39f99c9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Oct 1 21:01:58 2012 +0100

    fix merge

 gstreamer1-plugins-bad-free.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---