[media-explorer/f18: 3/3] fix merge

[Peter Robinson]

commit 6f07d0866ca3ba473df7adf491e041e209d6d542
Merge: ba8025b e574b89
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Sep 14 20:45:32 2012 +0100

    fix merge

 media-explorer.spec |    7 +++++--
 sources             |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---