[webkitgtk/f15: 2/2] Merge remote-tracking branch 'origin/master' into f15

[Kevin Fenzi]

commit 50bd44a6363f4896d295235f5754ccef6e7f9da2
Merge: e17df8f 49b11d8
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sun Jun 12 08:09:13 2011 -0600

    Merge remote-tracking branch 'origin/master' into f15

 .gitignore                             |    1 +
 sources                                |    2 +-
 webkit-1.3.13-gcc46-preprocessor.patch |   12 ------------
 webkitgtk.spec                         |    7 ++++---
 4 files changed, 6 insertions(+), 16 deletions(-)
---