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

[Kevin Fenzi]

commit 43b0d5c77925ed4fb97ef8e82e42a08d714787f1
Merge: 352e0f8 1740b79
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Wed Jan 5 22:59:35 2011 -0700

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

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