Merge remote branch 'qt/4.7' into 4.7
authorShane Kearns <shane.kearns@accenture.com>
Fri, 14 Oct 2011 16:17:58 +0000 (17:17 +0100)
committerShane Kearns <shane.kearns@accenture.com>
Fri, 14 Oct 2011 16:17:58 +0000 (17:17 +0100)
commitd089496936b9a17d7849d49b74f85838cb711634
tree8395c56f3c1e6b64cb781d7311fda56081f0ef51
parent2543ed5b1b18864797b3a11c9bd13887c7567e86
parent7a6a50879322945110120ffdec5d0e6820fc4b54
Merge remote branch 'qt/4.7' into 4.7

Conflicts:
src/corelib/kernel/qtranslator.cpp