[emerillon/f15: 7/7] fix merge

[Peter Robinson]

commit 75253dba41be87dd623826394cc973f4f1380fa0
Merge: 5af4ed7 38b77cf
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 7 18:00:58 2011 +0100

    fix merge

 emerillon-0.1.2-gtk3.patch |  300 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 300 insertions(+), 0 deletions(-)
---