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

[Kevin Fenzi]

commit 1d2686080b7aff9f497baf01104480bce6ed090a
Merge: 50bd44a 441b443
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Jul 1 16:33:31 2011 -0600

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

 .gitignore     |    1 +
 sources        |    2 +-
 webkitgtk.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---