[webkitgtk3/f16] Update to 1.6.1

[Ray Strode]

commit 49ee6ca8f07e240d049b8122618de1c382d9e918
Author: Ray Strode <rstrode at redhat.com>
Date:   Wed Sep 28 00:05:08 2011 -0400

    Update to 1.6.1

 .gitignore      |    1 +
 sources         |    2 +-
 webkitgtk3.spec |    8 ++++++++
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea36be6..76c328f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ webkit-1.3.3.tar.gz
 /webkit-1.5.1.tar.gz
 /webkit-1.5.2.tar.gz
 /webkit-1.5.90.tar.gz
+/webkit-1.6.1.tar.gz
diff --git a/sources b/sources
index 2acabe5..5a6b3bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19f046dcf68502e59bd03396edce60a8  webkit-1.5.90.tar.gz
+c11743694b1b71dad287b2e7a9e73b05  webkit-1.6.1.tar.gz
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index b65d96e..41ba388 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,13 @@
         cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
+<<<<<<< HEAD
 Version:        1.5.90
 Release:        1%{?dist}.1
+=======
+Version:        1.6.1
+Release:        1%{?dist}
+>>>>>>> e1cff90... Update to 1.6.1
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -162,6 +167,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 
 %changelog
+* Wed Oct 06 2011 Ray Strode <rstrode at redhat.com> 1.6.1-1
+- Update to 1.6.1
+
 * Mon Oct 03 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.5.90-1.1
 - rebuild (java), rel-eng#4932