[webkitgtk/f14/master: 2/2] Merge remote branch 'origin/master' into f14/master

[Kevin Fenzi]

commit 352e0f89b3290a5d740831e57ec8b4b4ce93c96a
Merge: 4b40574 8fa04a2
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Tue Nov 9 00:07:49 2010 -0700

    Merge remote branch 'origin/master' into f14/master

 .gitignore     |    1 +
 sources        |    2 +-
 webkitgtk.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc webkitgtk.spec
index f8300e3,7adbdcb..affde63
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@@ -218,17 -208,12 +218,20 @@@ glib-compile-schemas %{_datadir}/glib-2
  
  
  %changelog
+ * Mon Nov 08 2010 Kevin Fenzi <kevin at tummy.com> - 1.3.6-1
+ - Update to 1.3.6
+ 
  * Thu Oct 28 2010 Kevin Fenzi <kevin at tummy.com> - 1.3.5-1
- - Update to 1.3.5-1
+ - Update to 1.3.5
  
 +* Wed Oct 13 2010 Dan Horák <dan[at]danny.cz> - 1.3.4-4
 +- Add back updated s390(x) patch
 +- Do not generate debug information to prevent linker memory exhaustion on s390
 +  with its 2 GB address space
 +
 +* Fri Oct 01 2010 Kevin Fenzi <kevin at tummy.com> - 1.3.4-3.1
 +- Disable gobject-introspection for now, needs 0.9.5 or higher. 
 +
  * Wed Sep 29 2010 jkeating - 1.3.4-3
  - Rebuilt for gcc bug 634757