Merge branch 'stable' into st
Merge branch 'st' of git://github.com/suitabletech/qtwebkit into st