Merge branch '4.7-upstream' into 4.7
authorThierry Bastian <thierry.bastian@nokia.com>
Wed, 20 Apr 2011 08:59:13 +0000 (10:59 +0200)
committerThierry Bastian <thierry.bastian@nokia.com>
Wed, 20 Apr 2011 08:59:13 +0000 (10:59 +0200)
commit97d57498481598d0d4babfa77f816761dead29b8
tree8709b1f70c8ad75e225acf476e827cf4e15b85f3
parent0edbaca5e7b718bb9bbbeaccc9e322b525b4327e
parent6037cb7f68fe0dec52f922d9e2f18c8e12a396cb
Merge branch '4.7-upstream' into 4.7