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

[Kevin Fenzi]

commit 5813dae887d03d79145413b5e4a4a6cf67dcd99e
Merge: db7522c 0300932
Author: Kevin Fenzi <kevin at tummy.com>
Date:   Thu Jan 6 09:05:32 2011 -0700

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

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