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

[Kevin Fenzi]

commit 6c7a935a9158603c633e9c3f4cb1309ce48d8a05
Merge: 5813dae bf6eb15
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Mon Jan 10 22:58:01 2011 -0700

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

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 webkit-1.1.12-atomic-word.patch                    |   73 ----------
 webkit-1.1.12-no-execmem.patch                     |   12 --
 webkit-1.1.13-no-execmem.patch                     |   12 --
 webkit-1.1.14-atomic-word.patch                    |   75 -----------
 webkit-1.1.22-icu44.patch                          |  141 --------------------
 webkit-1.1.22-sparc.patch                          |   15 --
 ...execmem.patch => webkit-1.3.10-no-execmem.patch |    8 +-
 ...er.patch => webkit-1.3.10-nspluginwrapper.patch |    7 +-
 webkitgtk.spec                                     |   39 +++---
 11 files changed, 28 insertions(+), 357 deletions(-)
---