Merge remote branch 'upstream/4.7' into 4.7
authorRoland Wolf <ext-roland.wolf@nokia.com>
Mon, 6 Sep 2010 09:59:32 +0000 (11:59 +0200)
committerRoland Wolf <ext-roland.wolf@nokia.com>
Mon, 6 Sep 2010 09:59:32 +0000 (11:59 +0200)
commit03b787cdadb966898c86a06747deb39e2f7dae2f
tree188d10557683fb95defc966829ff3d14bc404e37
parent5180a674358d5b295e5f7e01f28649176ec0d33a
parentfded09d4e2983d7eed82c9fa5b678f70074473ba
Merge remote branch 'upstream/4.7' into 4.7