Merge branch 'master' into mmfphonon
authorFrans Englich <frans.englich@nokia.com>
Wed, 19 Aug 2009 08:15:38 +0000 (10:15 +0200)
committerFrans Englich <frans.englich@nokia.com>
Wed, 19 Aug 2009 08:18:18 +0000 (10:18 +0200)
commitca0b5b503e8865c0eedeea86aa132291281fc49f
tree1eca392e65bf5be617a5189d93a8327cc9ec5e34
parentf21096e918a587287d61446e930c40914e2b7ce5
parent23d2550e6d19c3e84ff2167f5696d4b6dd3f49d4
Merge branch 'master' into mmfphonon

Conflicts:
src/gui/itemviews/qitemselectionmodel.cpp
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp