Merge branch 'origin/4.5' into 4.6
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 25 Sep 2009 10:43:31 +0000 (12:43 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 25 Sep 2009 10:43:31 +0000 (12:43 +0200)
commit06a618df93a4b99118a4718544cd82e4e6c08754
tree0a261d3d7556150ffb7745be4027242c5494ca82
parentbb62bf61c0577a02003a33bf800025cb85e51b54
parentfeec449d63c355dd465dea7674d43923e999911e
Merge branch 'origin/4.5' into 4.6

Conflicts:
translations/qt_ru.ts