Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 10 Jun 2011 09:21:09 +0000 (19:21 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 10 Jun 2011 09:21:09 +0000 (19:21 +1000)
commitf07d637dfe39a3887c1c2374f0543e19d885ff90
tree3b1711bc5b5cf05afa8292ca1d9b10d0b81e5d94
parent796010e822884a895eaf1597f4ae20eb2c0ac926
parent5bb3af94428d85c9d08b3c4cfb31c4071604b06d
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix dialog position adjustment regression in Symbian
  SSL readbuffer 16->32 kB