[epiphany/gnome-3-0] [release] 3.0.4

[Xan Lopez <xan src gnome org>]

commit 4877a965d7df25bff160d9a90992b99ae2c54204
Author: Xan Lopez <xlopez igalia com>
Date:   Fri Jul 1 04:22:39 2011 +0200

    [release] 3.0.4

 NEWS         |   13 +++++++++++++
 configure.ac |    4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 456049a..9ca967c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 ==============
+Epiphany 3.0.4
+==============
+
+Changes:
+
+  - Do not use GNOME defaults for fonts anymore. Instead use whatever
+    is setup as "sans" and "serif".
+  - Make use picture as background work again (#647604)
+  - Fix removal of toolbar items through DnD (#647265)
+  - Respect gtk-keynav-wrap-around in global tab cycle shortcut.
+  - Depend on WebKitGTK+ 1.4.2, lots of stability fixes.
+
+==============
 Epiphany 3.0.3
 ==============
 
diff --git a/configure.ac b/configure.ac
index 9c85ef8..12ad5bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 m4_define([epiphany_version_major],[3])
 m4_define([epiphany_version_minor],[0])
-m4_define([epiphany_version_micro],[3])
+m4_define([epiphany_version_micro],[4])
 m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
 
 # This can be either "trunk" or "branches/gnome-x-y"
@@ -93,7 +93,7 @@ LIBXML_REQUIRED=2.6.12
 LIBXSLT_REQUIRED=1.1.7
 LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
 DBUS_GLIB_REQUIRED=0.35
-WEBKIT_GTK_REQUIRED=1.4.0
+WEBKIT_GTK_REQUIRED=1.4.2
 LIBSOUP_GNOME_REQUIRED=2.33.1
 GNOME_KEYRING_REQUIRED=2.26.0
 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1