Merge remote branch 'qt-master/master'
authorGuoqing Zhang <guoqing.zhang@nokia.com>
Mon, 11 Apr 2011 06:18:57 +0000 (09:18 +0300)
committerGuoqing Zhang <guoqing.zhang@nokia.com>
Mon, 11 Apr 2011 06:18:57 +0000 (09:18 +0300)
commit65d255c80d0e029bc94b320fa315095b957098a0
treed9b5bdb1474f22507e46f5525777ffc43277f081
parentfe4e8d469938f2c337e186c03930d543677c3ee2
parent082b9125d627df11692f2a03b80c9e962e82eda5
Merge remote branch 'qt-master/master'

Conflicts:
src/s60installs/qt.iby