epiphany r7047 - in branches/webkit: . data data/glade embed embed/mozilla lib/egg po src

[xrcalvar svn gnome org]

Author: xrcalvar
Date: 2007-05-24 17:53:18 +0100 (Thu, 24 May 2007)
New Revision: 7047
ViewCVS link: http://svn.gnome.org/viewcvs/epiphany?rev=7047&view=rev

Modified:
   branches/webkit/ChangeLog
   branches/webkit/ChangeLog.webkit
   branches/webkit/configure.ac
   branches/webkit/data/epiphany.schemas.in
   branches/webkit/data/glade/epiphany.glade
   branches/webkit/embed/ephy-cookie-manager.h
   branches/webkit/embed/ephy-embed-prefs.h
   branches/webkit/embed/mozilla/EphySingle.cpp
   branches/webkit/embed/mozilla/GeckoCookiePromptService.cpp
   branches/webkit/embed/mozilla/mozilla-notifiers.cpp
   branches/webkit/lib/egg/eggtreemultidnd.c
   branches/webkit/po/ChangeLog
   branches/webkit/po/POTFILES.skip
   branches/webkit/po/ar.po
   branches/webkit/po/cs.po
   branches/webkit/po/es.po
   branches/webkit/po/et.po
   branches/webkit/po/th.po
   branches/webkit/src/ephy-statusbar.c
   branches/webkit/src/prefs-dialog.c
Log:
		Merged the changes done in the trunk between the 
versions 7024 and 7045 (actual).