[kwebkitpart/f14: 4/4] Merge remote-tracking branch 'origin/f15' into f14

[nucleo]

commit 2751b32c4e59251180aacff5e70d6d26153e3da9
Merge: c6bf102 ed7b102
Author: nucleo <nucleo at fedoraproject.org>
Date:   Mon Jul 25 17:28:39 2011 +0300

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

 .gitignore       |    1 +
 kwebkitpart.spec |   52 ++++++++++++++++++++++++----------------------------
 sources          |    2 +-
 3 files changed, 26 insertions(+), 29 deletions(-)
---