[kwebkitpart/f15: 3/3] Merge branch 'master' into f15

[nucleo]

commit c10d6cec232869bddcd75f0eabb237c8da4e31f2
Merge: ed7b102 0891102
Author: nucleo <nucleo at fedoraproject.org>
Date:   Sun Oct 30 22:29:44 2011 +0200

    Merge branch 'master' into f15

 .gitignore       |    3 ++-
 kwebkitpart.spec |   17 +++++++++--------
 sources          |    2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)
---