Merge remote branch 'origin/4.7' into 4.7
authorOlivier Goffart <ogoffart@trolltech.com>
Tue, 30 Mar 2010 13:49:21 +0000 (15:49 +0200)
committerOlivier Goffart <ogoffart@trolltech.com>
Tue, 30 Mar 2010 13:49:21 +0000 (15:49 +0200)
commit00f7426f3906361fb5addb36e428648eee5e2983
treec299b0f6f323ea2f37161cfdf5b2fb33bbe35673
parent429b747d492ef038c2ed58a9a72060d951721252
parentae305abfdb795b472b2b9d200bf3b11af00d7d1f
Merge remote branch 'origin/4.7' into 4.7

Conflicts:
src/3rdparty/phonon/ds9/iodevicereader.cpp
src/3rdparty/phonon/ds9/iodevicereader.cpp