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

[Kevin Fenzi]

commit e17df8f48011e580171a7644cd3f5868987d686b
Merge: 3c94c13 e38c6ec
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Wed Apr 27 10:05:32 2011 -0600

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

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