Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Wed, 7 Dec 2011 13:45:19 +0000 (14:45 +0100)
committerLiang Qi <liang.qi@nokia.com>
Wed, 7 Dec 2011 13:45:19 +0000 (14:45 +0100)
commit3a4f6f7884c9ea704890cd392bb5a211d2eb5701
tree2be34e088894d59301c08c5f66dbbe2968ddceea
parent8a390046adddb8df3ddcf3a421f6f547e6cfe7aa
parentf485ac02b057cb076c965c3cd1bd9c78aaa5a696
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60main/newallocator_hook.cpp
src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp