[webkitgtk3: 4/4] fix merge

[Peter Robinson]

commit d0c1c4daf8170a4288bc6f0c9cf6af87b5b5b09a
Merge: f90557b 37728c3
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 18 11:18:56 2012 +0100

    fix merge

 webkit-r113389.diff |   30 ++++++++++++++++++++++++++++++
 webkit-r114385.diff |   40 ++++++++++++++++++++++++++++++++++++++++
 webkitgtk3.spec     |   12 +++++++++++-
 3 files changed, 81 insertions(+), 1 deletions(-)
---